mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 22:13:42 +01:00
36f34f01c0
Upstream has released updates that appears 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: da9ef3c5 #496: Add methods to get/set ItemStacks in EquipmentSlots 3abebc9f #492: Let Tameable extend Animals rather than Entity 941111a0 #495: Expose ItemStack and hand used in PlayerShearEntityEvent 4fe19cae #494: InventoryView - Add missing Brewing FUEL_TIME CraftBukkit Changes:933e9094#664: Add methods to get/set ItemStacks in EquipmentSlots18722312#662: Expose ItemStack and hand used in PlayerShearEntityEvent
53 lines
2.0 KiB
Diff
53 lines
2.0 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/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
index 896b1971c86410ccc62353e44bfe5a449f8a0c97..4af8e680dbcd3e0bc1ed692146b72fecbf7735ba 100644
|
|
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
@@ -11,6 +11,7 @@ import org.bukkit.attribute.Attributable;
|
|
import org.bukkit.block.Block;
|
|
import org.bukkit.entity.memory.MemoryKey;
|
|
import org.bukkit.inventory.EntityEquipment;
|
|
+import org.bukkit.inventory.ItemStack;
|
|
import org.bukkit.potion.PotionEffect;
|
|
import org.bukkit.potion.PotionEffectType;
|
|
import org.bukkit.projectiles.ProjectileSource;
|
|
@@ -568,5 +569,32 @@ 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. Will be null if no active item.
|
|
+ */
|
|
+ @Nullable
|
|
+ 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();
|
|
// Paper end
|
|
}
|