mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-03 18:24:49 +02:00
928bcc8d3a
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: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
52 lines
2.1 KiB
Diff
52 lines
2.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Fri, 12 Mar 2021 19:20:03 -0800
|
|
Subject: [PATCH] Adds PlayerArmSwingEvent
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/event/player/PlayerArmSwingEvent.java b/src/main/java/io/papermc/paper/event/player/PlayerArmSwingEvent.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..ce76b07cfaa9173c78e2844add2bc5bb437b1106
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/player/PlayerArmSwingEvent.java
|
|
@@ -0,0 +1,27 @@
|
|
+package io.papermc.paper.event.player;
|
|
+
|
|
+import org.bukkit.entity.Player;
|
|
+import org.bukkit.event.player.PlayerAnimationEvent;
|
|
+import org.bukkit.event.player.PlayerAnimationType;
|
|
+import org.bukkit.inventory.EquipmentSlot;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+public class PlayerArmSwingEvent extends PlayerAnimationEvent {
|
|
+
|
|
+ private final EquipmentSlot equipmentSlot;
|
|
+
|
|
+ public PlayerArmSwingEvent(@NotNull Player player, @NotNull EquipmentSlot equipmentSlot) {
|
|
+ super(player, equipmentSlot == EquipmentSlot.HAND ? PlayerAnimationType.ARM_SWING : PlayerAnimationType.OFF_ARM_SWING);
|
|
+ this.equipmentSlot = equipmentSlot;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Returns the hand of the arm swing.
|
|
+ *
|
|
+ * @return the hand
|
|
+ */
|
|
+ @NotNull
|
|
+ public EquipmentSlot getHand() {
|
|
+ return this.equipmentSlot;
|
|
+ }
|
|
+}
|
|
diff --git a/src/main/java/org/bukkit/event/player/PlayerAnimationEvent.java b/src/main/java/org/bukkit/event/player/PlayerAnimationEvent.java
|
|
index eb722a1e3b987b86fae2fa8346606fa15fada26f..11c27b1a4a749e129ed4b2d906c315d97a4b66e7 100644
|
|
--- a/src/main/java/org/bukkit/event/player/PlayerAnimationEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/player/PlayerAnimationEvent.java
|
|
@@ -7,6 +7,7 @@ import org.jetbrains.annotations.NotNull;
|
|
|
|
/**
|
|
* Represents a player animation event
|
|
+ * <br>Use {@link io.papermc.paper.event.player.PlayerArmSwingEvent} for determining which arm was swung.
|
|
*/
|
|
public class PlayerAnimationEvent extends PlayerEvent implements Cancellable {
|
|
private static final HandlerList handlers = new HandlerList();
|