2022-10-16 13:49:56 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: SoSeDiK <mrsosedik@gmail.com>
|
|
|
|
Date: Tue, 11 Oct 2022 22:35:56 +0300
|
|
|
|
Subject: [PATCH] Add LivingEntity#swingHand(EquipmentSlot) convenience method
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
|
2023-12-25 23:51:56 +01:00
|
|
|
index 3be060731b9b2df3408e8c5627a3640262cdc4d5..f9fe94d2bbfb5cd31ecc706e114be566fef7698a 100644
|
2022-10-16 13:49:56 +02:00
|
|
|
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
2023-12-25 23:51:56 +01:00
|
|
|
@@ -1167,5 +1167,23 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
2022-10-16 13:49:56 +02:00
|
|
|
*/
|
2023-03-14 23:13:41 +01:00
|
|
|
@Deprecated
|
2022-10-16 13:49:56 +02:00
|
|
|
void setHurtDirection(float hurtDirection);
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Makes this entity swing their hand.
|
|
|
|
+ *
|
|
|
|
+ * <p>This method does nothing if this entity does not
|
|
|
|
+ * have an animation for swinging their hand.
|
|
|
|
+ *
|
|
|
|
+ * @param hand hand to be swung, either {@link org.bukkit.inventory.EquipmentSlot#HAND} or {@link org.bukkit.inventory.EquipmentSlot#OFF_HAND}
|
|
|
|
+ * @throws IllegalArgumentException if invalid hand is passed
|
|
|
|
+ */
|
|
|
|
+ default void swingHand(@NotNull org.bukkit.inventory.EquipmentSlot hand) {
|
2022-10-23 01:50:12 +02:00
|
|
|
+ com.google.common.base.Preconditions.checkArgument(hand != null && hand.isHand(), String.format("Expected a valid hand, got \"%s\" instead!", hand));
|
2022-10-16 13:49:56 +02:00
|
|
|
+ if (hand == org.bukkit.inventory.EquipmentSlot.HAND) {
|
|
|
|
+ this.swingMainHand();
|
|
|
|
+ } else {
|
|
|
|
+ this.swingOffHand();
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
// Paper end
|
|
|
|
}
|