69 Zeilen
2.7 KiB
Diff
69 Zeilen
2.7 KiB
Diff
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
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
index b3aa3dc6aa5afbc36cc86741b4cba56f463c2234..9e012c3c0671e5d0e55c243fdb4e14057038c153 100644
|
|
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
@@ -328,7 +328,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();
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
index 2bfeebe26f32d2e931dc483714d30430deeb9b04..17e5d2e2acdae23d8ea3b3b1a89f62e8be7b81a8 100644
|
|
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
@@ -745,5 +745,42 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
|
* @param delay Delay in ticks
|
|
*/
|
|
void setShieldBlockingDelay(int delay);
|
|
+
|
|
+ /**
|
|
+ * Get's the item being actively "used" or consumed.
|
|
+ * @return The item
|
|
+ */
|
|
+ @NotNull
|
|
+ org.bukkit.inventory.ItemStack getActiveItem();
|
|
+
|
|
+ /**
|
|
+ * 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
|
|
}
|