From dd390c99fdc76621424dc15486fb66aa8dab7e26 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 18 Jul 2018 01:08:17 -0400 Subject: [PATCH] fix a patch catboy asked me to --- ...0093-Add-PlayerUseUnknownEntityEvent.patch | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/Spigot-Server-Patches/0093-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0093-Add-PlayerUseUnknownEntityEvent.patch index 312ea229c9..ec176908a3 100644 --- a/Spigot-Server-Patches/0093-Add-PlayerUseUnknownEntityEvent.patch +++ b/Spigot-Server-Patches/0093-Add-PlayerUseUnknownEntityEvent.patch @@ -1,4 +1,4 @@ -From f2aa3681729af76cbf7d48b050d2b022dc103701 Mon Sep 17 00:00:00 2001 +From 6d4327193f6dc1773ded2f0ecdb48e141f864542 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 2 Apr 2016 05:09:16 -0400 Subject: [PATCH] Add PlayerUseUnknownEntityEvent @@ -9,16 +9,16 @@ index 77440ac81..8711462e1 100644 --- a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java +++ b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java @@ -5,7 +5,7 @@ import javax.annotation.Nullable; - + public class PacketPlayInUseEntity implements Packet { - + - private int a; + private int a; public int getEntityId() { return this.a; } // Paper - add accessor private PacketPlayInUseEntity.EnumEntityUseAction action; private Vec3D c; private EnumHand d; diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 2cc277e4f..553011d88 100644 +index 2cc277e4f..b1f483990 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1888,6 +1888,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -30,14 +30,13 @@ index 2cc277e4f..553011d88 100644 + this.server.getPluginManager().callEvent(new com.destroystokyo.paper.event.player.PlayerUseUnknownEntityEvent( + this.getPlayer(), + packetplayinuseentity.getEntityId(), -+ packetplayinuseentity.a() == PacketPlayInUseEntity.EnumEntityUseAction.ATTACK, -+ packetplayinuseentity.b() == EnumHand.MAIN_HAND ? EquipmentSlot.HAND : EquipmentSlot.OFF_HAND ++ packetplayinuseentity.b() == PacketPlayInUseEntity.EnumEntityUseAction.ATTACK, ++ packetplayinuseentity.c() == EnumHand.MAIN_HAND ? EquipmentSlot.HAND : EquipmentSlot.OFF_HAND + )); + } + // Paper end - - } - --- -2.18.0 + } + +-- +2.18.0 \ No newline at end of file