From 3da7a74908fc61f855408c6da15aa9e9b285abce Mon Sep 17 00:00:00 2001 From: Tyler Murphy Date: Wed, 24 May 2023 14:10:47 -0400 Subject: 1.7.3 rc-1 --- .../hideAndSeek/util/packet/EntityMetadataPacket.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'src/main/java/net/tylermurphy/hideAndSeek/util/packet') diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/packet/EntityMetadataPacket.java b/src/main/java/net/tylermurphy/hideAndSeek/util/packet/EntityMetadataPacket.java index d77a227..051e4ae 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/util/packet/EntityMetadataPacket.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/util/packet/EntityMetadataPacket.java @@ -4,6 +4,9 @@ import com.comphenix.protocol.PacketType; import com.comphenix.protocol.wrappers.WrappedDataValue; import com.comphenix.protocol.wrappers.WrappedDataWatcher; import com.comphenix.protocol.wrappers.WrappedWatchableObject; + +import net.tylermurphy.hideAndSeek.Main; + import org.bukkit.entity.Entity; import org.jetbrains.annotations.NotNull; @@ -36,12 +39,7 @@ public class EntityMetadataPacket extends AbstractPacket { public void writeMetadata() { - // thank you to - // https://www.spigotmc.org/threads/unable-to-modify-entity-metadata-packet-using-protocollib-1-19-3.582442/ - - try { - // 1.19.3 And Up - Class.forName("com.comphenix.protocol.wrappers.WrappedDataValue"); + if (Main.getInstance().supports(19, 3)) { final List wrappedDataValueList = new ArrayList<>(); @@ -60,11 +58,12 @@ public class EntityMetadataPacket extends AbstractPacket { packet.getDataValueCollectionModifier().write(0, wrappedDataValueList); - } catch (ClassCastException | ClassNotFoundException ignored) { - // 1.9 to 1.19.2 And Up + } else { + packet.getWatchableCollectionModifier().write(0, watcher.getWatchableObjects()); + } } -} \ No newline at end of file +} -- cgit v1.2.3-freya