From 90c9e2f464f9ce8ec4a639884b9e6252f7a40c92 Mon Sep 17 00:00:00 2001 From: okx-code Date: Tue, 14 May 2024 02:18:41 +0100 Subject: [PATCH] Revert "Discard entities before adding NPCs" This reverts commit 5d2151f1cd458b66db140586924c28cb20cb698d. --- .../src/main/java/net/minelink/ctplus/nms/NpcPlayer.java | 2 +- .../java/net/minelink/ctplus/nms/NpcPlayerHelperImpl.java | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/nms/NpcPlayer.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/nms/NpcPlayer.java index 6eda53b07..6a3cc0ae3 100644 --- a/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/nms/NpcPlayer.java +++ b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/nms/NpcPlayer.java @@ -33,7 +33,7 @@ public class NpcPlayer extends ServerPlayer { public static NpcPlayer valueOf(Player player) { MinecraftServer minecraftServer = MinecraftServer.getServer(); ServerLevel worldServer = ((CraftWorld) player.getWorld()).getHandle(); - GameProfile gameProfile = new GameProfile(player.getUniqueId(), NpcNameGeneratorFactory.getNameGenerator().generate(player)); + GameProfile gameProfile = new GameProfile(UUID.randomUUID(), NpcNameGeneratorFactory.getNameGenerator().generate(player)); ClientInformation clientInformation = ((CraftPlayer) player).getHandle().clientInformation(); for (Map.Entry entry: ((CraftPlayer) player).getProfile().getProperties().entries()) { diff --git a/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/nms/NpcPlayerHelperImpl.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/nms/NpcPlayerHelperImpl.java index fe645b83c..3c3670ba5 100644 --- a/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/nms/NpcPlayerHelperImpl.java +++ b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/nms/NpcPlayerHelperImpl.java @@ -12,7 +12,6 @@ import net.minecraft.network.protocol.game.ClientboundSetEquipmentPacket; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.food.FoodData; import net.minecraft.world.item.ItemStack; @@ -51,12 +50,7 @@ public class NpcPlayerHelperImpl implements NpcPlayerHelper { serverPlayer.connection.send(packet); } - Entity oldPlayer = worldServer.getEntity(player.getUniqueId()); - - if (oldPlayer != null) { - oldPlayer.remove(Entity.RemovalReason.DISCARDED); - worldServer.addFreshEntity(npcPlayer); - } + worldServer.addFreshEntity(npcPlayer); return npcPlayer.getBukkitEntity(); }