diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/commands/ListCommand.java b/plugin/src/main/java/lol/pyr/znpcsplus/commands/ListCommand.java index ea750e5..61d7349 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/commands/ListCommand.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/commands/ListCommand.java @@ -20,7 +20,7 @@ public class ListCommand implements CommandHandler { @Override public void run(CommandContext context) throws CommandExecutionException { - TextComponent.Builder component = Component.text("Npc's:\n").color(NamedTextColor.GOLD).toBuilder(); + TextComponent.Builder component = Component.text("Npc List:\n").color(NamedTextColor.GOLD).toBuilder(); for (String id : npcRegistry.getModifiableIds()) { NpcImpl npc = npcRegistry.get(id).getNpc(); NpcLocation location = npc.getLocation(); diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_19PacketFactory.java b/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_19PacketFactory.java index cc29fcf..f875436 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_19PacketFactory.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_19PacketFactory.java @@ -1,6 +1,7 @@ package lol.pyr.znpcsplus.packets; import com.github.retrooper.packetevents.PacketEventsAPI; +import com.github.retrooper.packetevents.manager.server.ServerVersion; import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes; import com.github.retrooper.packetevents.protocol.player.GameMode; import com.github.retrooper.packetevents.protocol.player.UserProfile; @@ -19,12 +20,15 @@ import java.util.EnumSet; import java.util.concurrent.CompletableFuture; public class V1_19PacketFactory extends V1_16PacketFactory { + private final boolean oldTabPackets; public V1_19PacketFactory(TaskScheduler scheduler, MetadataFactory metadataFactory, PacketEventsAPI packetEvents, EntityPropertyRegistryImpl propertyRegistry) { super(scheduler, metadataFactory, packetEvents, propertyRegistry); + oldTabPackets = packetEvents.getServerManager().getVersion().isOlderThanOrEquals(ServerVersion.V_1_19_2); } @Override public CompletableFuture addTabPlayer(Player player, PacketEntity entity, PropertyHolder properties) { + if (oldTabPackets) return super.addTabPlayer(player, entity, properties); if (entity.getType() != EntityTypes.PLAYER) return CompletableFuture.completedFuture(null); CompletableFuture future = new CompletableFuture<>(); skinned(player, properties, new UserProfile(entity.getUuid(), Integer.toString(entity.getEntityId()))).thenAccept(profile -> { @@ -39,6 +43,10 @@ public class V1_19PacketFactory extends V1_16PacketFactory { @Override public void removeTabPlayer(Player player, PacketEntity entity) { + if (oldTabPackets) { + super.removeTabPlayer(player, entity); + return; + } if (entity.getType() != EntityTypes.PLAYER) return; sendPacket(player, new WrapperPlayServerPlayerInfoRemove(entity.getUuid())); }