aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0687-Adds-PlayerArmSwingEvent.patch
diff options
context:
space:
mode:
authorShane Freeder <[email protected]>2022-03-02 09:44:22 +0000
committerShane Freeder <[email protected]>2022-03-02 09:44:22 +0000
commitc6ea84c7fae8d2974820333505a39c7b01c39b90 (patch)
tree0a863ecd50aa71b1196200c545651fe7eb779e2a /patches/server/0687-Adds-PlayerArmSwingEvent.patch
parentd3caeeb6c27cc832030a90c714a69ad2457b6e95 (diff)
downloadPaper-c6ea84c7fae8d2974820333505a39c7b01c39b90.tar.gz
Paper-c6ea84c7fae8d2974820333505a39c7b01c39b90.zip
Drop unneeded desync patch
spigot no longer even fires the event for this case, so, this may actually be a regression, not too sure here, but, as-is this patch is dead
Diffstat (limited to 'patches/server/0687-Adds-PlayerArmSwingEvent.patch')
-rw-r--r--patches/server/0687-Adds-PlayerArmSwingEvent.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/patches/server/0687-Adds-PlayerArmSwingEvent.patch b/patches/server/0687-Adds-PlayerArmSwingEvent.patch
new file mode 100644
index 0000000000..0ac17873c1
--- /dev/null
+++ b/patches/server/0687-Adds-PlayerArmSwingEvent.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Fri, 12 Mar 2021 19:22:21 -0800
+Subject: [PATCH] Adds PlayerArmSwingEvent
+
+
+diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index 4cfc463818964acbd695e6cb4767883835b90eab..a11647ab2b75870c6d7366260865c261e5cfd52d 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -2257,7 +2257,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+ }
+
+ // Arm swing animation
+- PlayerAnimationEvent event = new PlayerAnimationEvent(this.getCraftPlayer());
++ io.papermc.paper.event.player.PlayerArmSwingEvent event = new io.papermc.paper.event.player.PlayerArmSwingEvent(this.getCraftPlayer(), packet.getHand() == InteractionHand.MAIN_HAND ? org.bukkit.inventory.EquipmentSlot.HAND : org.bukkit.inventory.EquipmentSlot.OFF_HAND); // Paper
+ this.cserver.getPluginManager().callEvent(event);
+
+ if (event.isCancelled()) return;