Skip to content

Commit 55201f0

Browse files
Updated Upstream (Bukkit/CraftBukkit) (#7936)
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: c1d911a Add compat constructor to PlayerAnimationEvent CraftBukkit Changes: effea36 PR-1065: Add missing calls for BlockSpreadEvent when Sculk spreads
1 parent d7165b0 commit 55201f0

File tree

3 files changed

+5
-19
lines changed

3 files changed

+5
-19
lines changed

patches/api/0314-Adds-PlayerArmSwingEvent.patch

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Subject: [PATCH] Adds PlayerArmSwingEvent
66

77
diff --git a/src/main/java/io/papermc/paper/event/player/PlayerArmSwingEvent.java b/src/main/java/io/papermc/paper/event/player/PlayerArmSwingEvent.java
88
new file mode 100644
9-
index 0000000000000000000000000000000000000000..1a4550a73e89f9cf92d2831d21bcfb46f92fd189
9+
index 0000000000000000000000000000000000000000..ce76b07cfaa9173c78e2844add2bc5bb437b1106
1010
--- /dev/null
1111
+++ b/src/main/java/io/papermc/paper/event/player/PlayerArmSwingEvent.java
1212
@@ -0,0 +1,27 @@
@@ -23,7 +23,7 @@ index 0000000000000000000000000000000000000000..1a4550a73e89f9cf92d2831d21bcfb46
2323
+ private final EquipmentSlot equipmentSlot;
2424
+
2525
+ public PlayerArmSwingEvent(@NotNull Player player, @NotNull EquipmentSlot equipmentSlot) {
26-
+ super(player, PlayerAnimationType.ARM_SWING);
26+
+ super(player, equipmentSlot == EquipmentSlot.HAND ? PlayerAnimationType.ARM_SWING : PlayerAnimationType.OFF_ARM_SWING);
2727
+ this.equipmentSlot = equipmentSlot;
2828
+ }
2929
+
@@ -38,7 +38,7 @@ index 0000000000000000000000000000000000000000..1a4550a73e89f9cf92d2831d21bcfb46
3838
+ }
3939
+}
4040
diff --git a/src/main/java/org/bukkit/event/player/PlayerAnimationEvent.java b/src/main/java/org/bukkit/event/player/PlayerAnimationEvent.java
41-
index b7ca545c3574d4639f2783f2367de871086a5704..e93bb1ed0fdb99b38ecb84eba99bf08f150f75f0 100644
41+
index eb722a1e3b987b86fae2fa8346606fa15fada26f..11c27b1a4a749e129ed4b2d906c315d97a4b66e7 100644
4242
--- a/src/main/java/org/bukkit/event/player/PlayerAnimationEvent.java
4343
+++ b/src/main/java/org/bukkit/event/player/PlayerAnimationEvent.java
4444
@@ -7,6 +7,7 @@ import org.jetbrains.annotations.NotNull;
@@ -49,17 +49,3 @@ index b7ca545c3574d4639f2783f2367de871086a5704..e93bb1ed0fdb99b38ecb84eba99bf08f
4949
*/
5050
public class PlayerAnimationEvent extends PlayerEvent implements Cancellable {
5151
private static final HandlerList handlers = new HandlerList();
52-
@@ -24,6 +25,13 @@ public class PlayerAnimationEvent extends PlayerEvent implements Cancellable {
53-
animationType = playerAnimationType;
54-
}
55-
56-
+ // Paper start - readd old constructor
57-
+ @Deprecated
58-
+ public PlayerAnimationEvent(@NotNull final Player player) {
59-
+ this(player, PlayerAnimationType.ARM_SWING);
60-
+ }
61-
+ // Paper end
62-
+
63-
/**
64-
* Get the type of this animation event
65-
*

work/Bukkit

Submodule Bukkit updated from 45d9c73 to c1d911a

work/CraftBukkit

Submodule CraftBukkit updated from cc7edd6 to effea36

0 commit comments

Comments
 (0)