Paper/Spigot-Server-Patches/0238-LivingEntity-Hand-Raised-Item-Use-API.patch

67 lines
2.3 KiB
Diff
Raw Normal View History

From 6f38b65376127fff7e2c97dcbc7571677ac50af6 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 2196dbfce..fea821be1 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
2019-12-12 00:43:22 +01:00
@@ -112,7 +112,7 @@ public abstract class EntityLiving extends Entity {
private float bB;
2019-04-30 03:20:24 +02:00
private int jumpTicks;
2019-12-12 00:43:22 +01:00
private float bD;
- protected ItemStack activeItem;
+ public ItemStack activeItem; // Paper - public
2019-12-12 00:43:22 +01:00
protected int bl;
protected int bm;
private BlockPosition bE;
@@ -2976,10 +2976,12 @@ public abstract class EntityLiving extends Entity {
return this.activeItem;
}
2019-12-12 00:43:22 +01:00
+ public int getItemUseRemainingTime() { return this.dE(); } // Paper - OBFHELPER
public int dE() {
return this.bl;
}
2019-12-12 00:43:22 +01:00
+ public int getHandRaisedTime() { return this.dF(); } // Paper - OBFHELPER
public int dF() {
return this.isHandRaised() ? this.activeItem.k() - this.dE() : 0;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 67f275321..379239567 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -642,5 +642,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.25.0.windows.1