From 644d58c80ef6ab1734301785b64b5cf683484cc3 Mon Sep 17 00:00:00 2001 From: filoghost Date: Wed, 5 Jun 2019 11:48:44 +0200 Subject: [PATCH] Support new packet constructor --- .../packet/WrapperPlayServerSpawnEntity.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/Plugin/src/main/java/com/gmail/filoghost/holographicdisplays/bridge/protocollib/current/packet/WrapperPlayServerSpawnEntity.java b/Plugin/src/main/java/com/gmail/filoghost/holographicdisplays/bridge/protocollib/current/packet/WrapperPlayServerSpawnEntity.java index bb294799..36c4b372 100644 --- a/Plugin/src/main/java/com/gmail/filoghost/holographicdisplays/bridge/protocollib/current/packet/WrapperPlayServerSpawnEntity.java +++ b/Plugin/src/main/java/com/gmail/filoghost/holographicdisplays/bridge/protocollib/current/packet/WrapperPlayServerSpawnEntity.java @@ -25,6 +25,7 @@ import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.events.PacketEvent; import com.comphenix.protocol.injector.PacketConstructor; import com.comphenix.protocol.reflect.IntEnum; +import com.gmail.filoghost.holographicdisplays.util.NMSVersion; public class WrapperPlayServerSpawnEntity extends AbstractPacket { public static final PacketType TYPE = PacketType.Play.Server.SPAWN_ENTITY; @@ -90,9 +91,19 @@ public class WrapperPlayServerSpawnEntity extends AbstractPacket { // Useful constructor private static PacketContainer fromEntity(Entity entity, int type, int objectData) { - if (entityConstructor == null) - entityConstructor = ProtocolLibrary.getProtocolManager().createPacketConstructor(TYPE, entity, type, objectData); - return entityConstructor.createPacket(entity, type, objectData); + if (entityConstructor == null) { + if (NMSVersion.isGreaterEqualThan(NMSVersion.v1_14_R1)) { + entityConstructor = ProtocolLibrary.getProtocolManager().createPacketConstructor(TYPE, entity, objectData); + } else { + entityConstructor = ProtocolLibrary.getProtocolManager().createPacketConstructor(TYPE, entity, type, objectData); + } + } + + if (NMSVersion.isGreaterEqualThan(NMSVersion.v1_14_R1)) { + return entityConstructor.createPacket(entity, objectData); + } else { + return entityConstructor.createPacket(entity, type, objectData); + } } /**