geforkt von Mirrors/Paper
298c9022b0
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:
ccb9614e #548: LivingEntity - add methods for getting/setting invisibility
CraftBukkit Changes:
f8d4da08 #743: LivingEntity - add methods for getting/setting invisibility
Spigot Changes:
17d78dbd Rebuild patches
53 Zeilen
2.0 KiB
Diff
53 Zeilen
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 879dec59f202ee95043bd7317a672cd59ab3bbbe..8b89c0701dd557bcab0c05c1593354ee704b9fe4 100644
|
|
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
@@ -12,6 +12,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;
|
|
@@ -642,5 +643,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
|
|
}
|