From 65415a5796d4569864329efea7554677598e7dc2 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Wed, 14 Jul 2021 06:12:56 +1200 Subject: [PATCH] Fix entity use attack --- .../packetlisteners/PacketListenerClientInteract.java | 9 ++++++++- 1 file changed, 8 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 f48fe563..42160809 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 @@ -6,6 +6,7 @@ import com.comphenix.protocol.events.PacketAdapter; import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.events.PacketEvent; import com.comphenix.protocol.wrappers.EnumWrappers; +import com.comphenix.protocol.wrappers.WrappedEnumEntityUseAction; import me.libraryaddict.disguise.DisguiseAPI; import me.libraryaddict.disguise.DisguiseConfig; import me.libraryaddict.disguise.LibsDisguises; @@ -77,7 +78,13 @@ public class PacketListenerClientInteract extends PacketAdapter { return packet.getHands().read(0); } - return packet.getEnumEntityUseActions().read(0).getHand(); + WrappedEnumEntityUseAction action = packet.getEnumEntityUseActions().read(0); + + if (action.getAction() == EnumWrappers.EntityUseAction.ATTACK) { + return EnumWrappers.Hand.MAIN_HAND; + } + + return action.getHand(); } private EnumWrappers.EntityUseAction getInteractType(PacketContainer packet) {