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

67 lines
2.3 KiB
Diff
Raw Normal View History

2019-05-06 04:58:04 +02:00
From 5c1bdf2ae1a97542091fe38dad080f0f7376b059 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
2019-05-06 04:58:04 +02:00
index 66daa77d10..de0f9f57d2 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
2019-04-30 03:20:24 +02:00
@@ -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
2019-04-30 03:20:24 +02:00
protected int bo;
protected int bp;
private BlockPosition bG;
@@ -2893,10 +2893,12 @@ public abstract class EntityLiving extends Entity {
return this.activeItem;
}
2019-04-30 03:20:24 +02:00
+ public int getItemUseRemainingTime() { return dm(); } // Paper - OBFHELPER
public int dm() {
return this.bo;
}
2019-04-30 03:20:24 +02:00
+ public int getHandRaisedTime() { return 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
2019-05-06 04:58:04 +02:00
index aeb4b7343e..00fae68408 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
2019-05-06 04:58:04 +02:00
@@ -616,5 +616,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.21.0