geforkt von Mirrors/Paper
2f782a6652
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 CraftBukkit Changes:17543ecfSPIGOT-5035: Error Using Virtual Merchant GUI0fc6922bSPIGOT-5028: Villager#setVillagerExperience() doesn't workbdbdbe44SPIGOT-5024: Fox error - Unknown target reason
56 Zeilen
2.0 KiB
Diff
56 Zeilen
2.0 KiB
Diff
From c010112cddd5f278c0a3eb5d761482c589478d15 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 e08dfe17f..6e3284b20 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;
|
|
@@ -537,5 +538,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
|
|
}
|
|
--
|
|
2.21.0
|
|
|