Fixed wrong NPC positions

Author: Pascalpex

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>net.pascalpex</groupId>
     <artifactId>PexNPC</artifactId>
-    <version>1.22</version>
+    <version>1.23</version>
     <packaging>jar</packaging>
 
     <name>PexNPC</name>

src/main/java/net/pascalpex/npc/Main.java

@@ -95,7 +95,7 @@ public void onEnable() {
                 NPC.addJoinPacket(player);
             }
         }
-        Bukkit.getConsoleSender().sendMessage(ChatColor.GREEN + "PexNPC 1.22 von Pascalpex Aktiviert.");
+        Bukkit.getConsoleSender().sendMessage(ChatColor.GREEN + "PexNPC 1.23 von Pascalpex Aktiviert.");
     }
 
     private void fetchNewestVersion() {
@@ -131,7 +131,7 @@ public void onDisable() {
             }
         }
         this.getServer().getMessenger().unregisterOutgoingPluginChannel(this);
-        Bukkit.getConsoleSender().sendMessage(ChatColor.RED + "PexNPC 1.22 von Pascalpex Deaktiviert.");
+        Bukkit.getConsoleSender().sendMessage(ChatColor.RED + "PexNPC 1.23 von Pascalpex Deaktiviert.");
     }
 
     @Override
@@ -142,7 +142,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
                 if (player.hasPermission("pexnpc.command")) {
 
                     if (args.length == 0) {
-                        player.sendMessage(prefix + "PexNPC 1.22 von Pascalpex");
+                        player.sendMessage(prefix + "PexNPC 1.23 von Pascalpex");
                         player.sendMessage(prefix + "Verfügbare Befehle:");
                         player.sendMessage(prefix + "/pexnpc help " + ChatColor.DARK_GRAY + "| " + ChatColor.GOLD + "Zeigt diese Seite an");
                         player.sendMessage(prefix + "/pexnpc reload " + ChatColor.DARK_GRAY + "| " + ChatColor.GOLD + "Lädt die NPCs und Dateien neu");
@@ -159,7 +159,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
                     }
                     if (args.length == 1) {
                         if (args[0].equalsIgnoreCase("help")) {
-                            player.sendMessage(prefix + "PexNPC 1.22 von Pascalpex");
+                            player.sendMessage(prefix + "PexNPC 1.23 von Pascalpex");
                             player.sendMessage(prefix + "Verfügbare Befehle:");
                             player.sendMessage(prefix + "/pexnpc help " + ChatColor.DARK_GRAY + "| " + ChatColor.GOLD + "Zeigt diese Seite an");
                             player.sendMessage(prefix + "/pexnpc reload " + ChatColor.DARK_GRAY + "| " + ChatColor.GOLD + "Lädt die NPCs und Dateien neu");

src/main/java/net/pascalpex/npc/util/NPC.java

@@ -7,6 +7,7 @@
 import com.mojang.brigadier.LiteralMessage;
 import com.mojang.datafixers.util.Pair;
 import net.minecraft.Optionull;
+import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.ComponentUtils;
 import net.minecraft.network.chat.RemoteChatSession;
 import net.minecraft.network.protocol.game.*;
@@ -20,6 +21,7 @@
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.network.ServerGamePacketListenerImpl;
 import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.scores.PlayerTeam;
 import net.minecraft.world.scores.Scoreboard;
 import net.pascalpex.npc.Config;
@@ -231,7 +233,8 @@ public static void addNPCPacket(ServerPlayer npc, String suffix) {
             if (player.getWorld().equals(worldMap.get(npc.getId()))) {
                 ServerGamePacketListenerImpl connection = ((CraftPlayer) player).getHandle().connection;
                 connection.send(createInitPacket(npc));
-                connection.send(new ClientboundAddEntityPacket(npc, 0, npc.blockPosition()));
+                Vec3 pos = npc.position();
+                connection.send(new ClientboundAddEntityPacket(npc.getId(), npc.getUUID(), pos.x(), pos.y(), pos.z(), npc.getXRot(), npc.getYRot(), npc.getType(), 0, npc.getDeltaMovement(), npc.getYHeadRot()));
                 connection.send(new ClientboundRotateHeadPacket(npc, (byte) (NpcData.getLocation(getID(npc)).getYaw() * 256f / 360f)));
                 Scoreboard scoreboard = new Scoreboard();
                 PlayerTeam team = new PlayerTeam(scoreboard, npc.getUUID().toString());
@@ -266,7 +269,8 @@ public static void addJoinPacket(Player player) {
                 ServerGamePacketListenerImpl connection = ((CraftPlayer) player).getHandle().connection;
                 connection.send(createInitPacket(npc));
                 connection.send(new ClientboundEntityEventPacket(npc, (byte) 1));
-                connection.send(new ClientboundAddEntityPacket(npc, 0, npc.blockPosition()));
+                Vec3 pos = npc.position();
+                connection.send(new ClientboundAddEntityPacket(npc.getId(), npc.getUUID(), pos.x(), pos.y(), pos.z(), npc.getXRot(), npc.getYRot(), npc.getType(), 0, npc.getDeltaMovement(), npc.getYHeadRot()));
                 connection.send(new ClientboundRotateHeadPacket(npc, (byte) (NpcData.getLocation(getID(npc)).getYaw() * 256f / 360f)));
                 Scoreboard scoreboard = new Scoreboard();
                 PlayerTeam team = new PlayerTeam(scoreboard, npc.getUUID().toString());

src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
 main: net.pascalpex.npc.Main
 name: PexNPC
-version: 1.22
+version: 1.23
 author: Pascalpex
 prefix: PexNPC
 softdepend: