From afe4022920d7c920f3e3a72b7f5af166d14ed70a Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Thu, 1 Jul 2021 07:44:13 +1200 Subject: [PATCH] Fix a new error for 1.17 --- .../packetlisteners/PacketListenerClientInteract.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerClientInteract.java b/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerClientInteract.java index 2ca38153..405dafd1 100644 --- a/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerClientInteract.java +++ b/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerClientInteract.java @@ -16,6 +16,7 @@ import me.libraryaddict.disguise.disguisetypes.TargetedDisguise; import me.libraryaddict.disguise.disguisetypes.watchers.*; import me.libraryaddict.disguise.events.DisguiseInteractEvent; import me.libraryaddict.disguise.utilities.DisguiseUtilities; +import me.libraryaddict.disguise.utilities.reflection.NmsVersion; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Axolotl; @@ -81,7 +82,14 @@ public class PacketListenerClientInteract extends PacketAdapter { // The type of interact, we don't care the difference with "Interact_At" however as it's not // useful // for self disguises - EnumWrappers.EntityUseAction interactType = packet.getEntityUseActions().read(0); + EnumWrappers.EntityUseAction interactType; + + if (NmsVersion.v1_17.isSupported()) { + interactType = packet.getEnumEntityUseActions().read(0).getAction(); + } else { + interactType = packet.getEntityUseActions().read(0); + } + final EquipmentSlot handUsed; // Attack has a null hand, which throws an error if you attempt to fetch