mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 11:42:55 +01:00
66 lines
2.3 KiB
Diff
66 lines
2.3 KiB
Diff
From b0faee85e57c0c7015285cd9537162bb4ba3d1c9 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 ca266029e4..1500e43eee 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;
|
|
@@ -2899,10 +2899,12 @@ public abstract class EntityLiving extends Entity {
|
|
return this.activeItem;
|
|
}
|
|
|
|
+ public int getItemUseRemainingTime() { return dn(); } // Paper - OBFHELPER
|
|
public int dn() {
|
|
return this.bo;
|
|
}
|
|
|
|
+ public int getHandRaisedTime() { return do_(); } // Paper - OBFHELPER
|
|
public int do_() {
|
|
return this.isHandRaised() ? this.activeItem.k() - this.dn() : 0;
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
index 513b3fac7f..8dea7d36b6 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
|
|
|