From ea688d4a7f14a44362f33e207c455d5bdf1a9181 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 29 Jun 2018 00:21:28 -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/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index dfbd40a997..e1972f7935 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -109,7 +109,7 @@ public abstract class EntityLiving extends Entity {
     private float bD;
     private int jumpTicks;
     private float bF;
-    protected ItemStack activeItem;
+    public ItemStack activeItem; // Paper - public
     protected int bo;
     protected int bp;
     private BlockPosition bG;
@@ -2900,10 +2900,12 @@ public abstract class EntityLiving extends Entity {
         return this.activeItem;
     }
 
+    public int getItemUseRemainingTime() { return this.dm(); } // Paper - OBFHELPER
     public int dm() {
         return this.bo;
     }
 
+    public int getHandRaisedTime() { return this.dn(); } // Paper - OBFHELPER
     public int dn() {
         return this.isHandRaised() ? this.activeItem.k() - this.dm() : 0;
     }
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 06cc48a1dc..0610d0d5c0 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -629,5 +629,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
     public void setShieldBlockingDelay(int delay) {
         getHandle().setShieldBlockingDelay(delay);
     }
+
+    @Override
+    public ItemStack getActiveItem() {
+        return getHandle().activeItem.asBukkitMirror();
+    }
+
+    @Override
+    public int getItemUseRemainingTime() {
+        return getHandle().getItemUseRemainingTime();
+    }
+
+    @Override
+    public int getHandRaisedTime() {
+        return getHandle().getHandRaisedTime();
+    }
+
+    @Override
+    public boolean isHandRaised() {
+        return getHandle().isHandRaised();
+    }
     // Paper end
 }
-- 
2.22.0