papermc/Spigot-Server-Patches/0235-LivingEntity-Hand-Raised-Item-Use-API.patch

64 lines
2.4 KiB
Diff
Raw Normal View History

From 0000000000000000000000000000000000000000 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 2a567dca19034ed9071ef09b5371eabb5fff557c..d604728db71d4e61a11fb1ccb7f02b6f6b914a51 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
2019-12-11 23:43:22 +00:00
@@ -112,7 +112,7 @@ public abstract class EntityLiving extends Entity {
private float bB;
2019-04-30 01:20:24 +00:00
private int jumpTicks;
2019-12-11 23:43:22 +00:00
private float bD;
- protected ItemStack activeItem;
+ public ItemStack activeItem; // Paper - public
2019-12-11 23:43:22 +00:00
protected int bl;
protected int bm;
private BlockPosition bE;
@@ -2980,10 +2980,12 @@ public abstract class EntityLiving extends Entity {
return this.activeItem;
}
2019-12-11 23:43:22 +00:00
+ public int getItemUseRemainingTime() { return this.dE(); } // Paper - OBFHELPER
public int dE() {
return this.bl;
}
2019-12-11 23:43:22 +00: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 a8e44e95d6115833f4e20e6bb007842bdc52f1ef..3a87c6574bbad9e6c2d7573eb447194c931d7ec4 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -654,5 +654,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
}