aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0690-Adds-PlayerArmSwingEvent.patch
diff options
context:
space:
mode:
authorNoah van der Aa <[email protected]>2021-12-01 02:31:13 +0100
committerGitHub <[email protected]>2021-11-30 17:31:13 -0800
commitcd9fe9ca642322f8ba560a8c0f86c877af2cd10f (patch)
tree0099ebdd316d7b54e32fde7c5039011555b330ad /patches/server/0690-Adds-PlayerArmSwingEvent.patch
parenteffa3bad36df91b9cca1920e357b963806f62ff6 (diff)
downloadPaper-cd9fe9ca642322f8ba560a8c0f86c877af2cd10f.tar.gz
Paper-cd9fe9ca642322f8ba560a8c0f86c877af2cd10f.zip
Port flat bedrock (generator settings) to 1.18 (#6960)
Diffstat (limited to 'patches/server/0690-Adds-PlayerArmSwingEvent.patch')
-rw-r--r--patches/server/0690-Adds-PlayerArmSwingEvent.patch19
1 files changed, 0 insertions, 19 deletions
diff --git a/patches/server/0690-Adds-PlayerArmSwingEvent.patch b/patches/server/0690-Adds-PlayerArmSwingEvent.patch
deleted file mode 100644
index 10e2f0ccb8..0000000000
--- a/patches/server/0690-Adds-PlayerArmSwingEvent.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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 8705df3ca3df6b4aa77b38e1a0b6ad5fc3bc3f28..d66c9c09ae3874dd53ef298f94a0e5c6177f2b35 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2230,7 +2230,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;