2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Fri, 29 Jun 2018 00:19:19 -0400
|
|
|
|
Subject: [PATCH] LivingEntity Hand Raised/Item Use API
|
|
|
|
|
|
|
|
How long an entity has raised hands to charge an attack or use an item
|
|
|
|
|
2022-06-24 10:04:02 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
|
|
index bd9222b9b5e7ec1f3aebe37838775f345e868150..34c2ae10e2a230ef88a756cf2024edcda2429fbf 100644
|
|
|
|
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
|
|
@@ -307,7 +307,9 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
|
|
|
|
*
|
|
|
|
* @return the item being used by the player, or null if they are not using
|
|
|
|
* an item
|
|
|
|
+ * @deprecated Deprecated in favor of {@link LivingEntity#getActiveItem()}
|
|
|
|
*/
|
|
|
|
+ @Deprecated // Paper
|
|
|
|
@Nullable
|
|
|
|
public ItemStack getItemInUse();
|
|
|
|
|
2021-06-11 14:02:28 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
|
2022-06-24 10:04:02 +02:00
|
|
|
index 588ad09a764236cf858a4e6689cf4ee5246e6f08..1dd9f7ac1f26c253b8181519aa1873784bc54a07 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
2022-06-24 10:04:02 +02:00
|
|
|
@@ -649,5 +649,42 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
2021-06-11 14:02:28 +02:00
|
|
|
* @param delay Delay in ticks
|
|
|
|
*/
|
|
|
|
void setShieldBlockingDelay(int delay);
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Get's the item being actively "used" or consumed.
|
2022-06-24 10:04:02 +02:00
|
|
|
+ * @return The item
|
2021-06-11 14:02:28 +02:00
|
|
|
+ */
|
2022-06-24 10:04:02 +02:00
|
|
|
+ @NotNull
|
|
|
|
+ org.bukkit.inventory.ItemStack getActiveItem();
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Get's remaining time a player needs to keep hands raised with an item to finish using it.
|
|
|
|
+ * @return Remaining ticks to use the item
|
|
|
|
+ */
|
|
|
|
+ int getItemUseRemainingTime();
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Get how long the players hands have been raised (Charging Bow attack, using a potion, etc)
|
|
|
|
+ *
|
|
|
|
+ * @return Get how long the players hands have been raised (Charging Bow attack, using a potion, etc)
|
|
|
|
+ */
|
|
|
|
+ int getHandRaisedTime();
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Whether or not this entity is using or charging an attack (Bow pulled back, drinking potion, eating food)
|
|
|
|
+ *
|
|
|
|
+ * @return Whether or not this entity is using or charging an attack (Bow pulled back, drinking potion, eating food)
|
|
|
|
+ */
|
|
|
|
+ boolean isHandRaised();
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Gets the hand raised by this living entity. Will be either
|
|
|
|
+ * {@link org.bukkit.inventory.EquipmentSlot#HAND} or
|
|
|
|
+ * {@link org.bukkit.inventory.EquipmentSlot#OFF_HAND}.
|
|
|
|
+ *
|
|
|
|
+ * @return the hand raised
|
|
|
|
+ */
|
|
|
|
+ @NotNull
|
|
|
|
+ org.bukkit.inventory.EquipmentSlot getHandRaised();
|
|
|
|
// Paper end
|
|
|
|
}
|