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:
c1d911a2 Add compat constructor to PlayerAnimationEvent

CraftBukkit Changes:
effea36a2 PR-1065: Add missing calls for BlockSpreadEvent when Sculk spreads
This commit is contained in:
Jake Potrebic
2022-06-11 02:02:57 -07:00
parent 4e76d31387
commit 5a405cfe8e
3 changed files with 3 additions and 17 deletions

View File

@@ -23,7 +23,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ private final EquipmentSlot equipmentSlot;
+
+ public PlayerArmSwingEvent(@NotNull Player player, @NotNull EquipmentSlot equipmentSlot) {
+ super(player, PlayerAnimationType.ARM_SWING);
+ super(player, equipmentSlot == EquipmentSlot.HAND ? PlayerAnimationType.ARM_SWING : PlayerAnimationType.OFF_ARM_SWING);
+ this.equipmentSlot = equipmentSlot;
+ }
+
@@ -49,17 +49,3 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
*/
public class PlayerAnimationEvent extends PlayerEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList();
@@ -0,0 +0,0 @@ public class PlayerAnimationEvent extends PlayerEvent implements Cancellable {
animationType = playerAnimationType;
}
+ // Paper start - readd old constructor
+ @Deprecated
+ public PlayerAnimationEvent(@NotNull final Player player) {
+ this(player, PlayerAnimationType.ARM_SWING);
+ }
+ // Paper end
+
/**
* Get the type of this animation event
*