2020-05-06 09:48:49 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-06-29 04:55:29 +00:00
|
|
|
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
|
2020-07-22 23:35:44 +00:00
|
|
|
index c549eda057b58b985bef98fabeaa642280cff1c3..b7df37450c1fa4cdefa8267005d052180291d5ba 100644
|
2018-06-29 04:55:29 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
2020-06-25 14:09:55 +00:00
|
|
|
@@ -118,7 +118,7 @@ public abstract class EntityLiving extends Entity {
|
2019-12-11 23:43:22 +00:00
|
|
|
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;
|
2018-07-22 05:27:46 +00:00
|
|
|
- protected ItemStack activeItem;
|
|
|
|
+ public ItemStack activeItem; // Paper - public
|
2020-06-25 14:09:55 +00:00
|
|
|
protected int bk;
|
2019-12-11 23:43:22 +00:00
|
|
|
protected int bl;
|
|
|
|
private BlockPosition bE;
|
2020-07-22 23:35:44 +00:00
|
|
|
@@ -3152,10 +3152,12 @@ public abstract class EntityLiving extends Entity {
|
2018-06-29 04:55:29 +00:00
|
|
|
return this.activeItem;
|
|
|
|
}
|
|
|
|
|
2020-06-25 14:09:55 +00:00
|
|
|
+ public int getItemUseRemainingTime() { return this.dY(); } // Paper - OBFHELPER
|
|
|
|
public int dY() {
|
|
|
|
return this.bk;
|
2018-06-29 04:55:29 +00:00
|
|
|
}
|
|
|
|
|
2020-06-25 14:09:55 +00:00
|
|
|
+ public int getHandRaisedTime() { return this.dZ(); } // Paper - OBFHELPER
|
|
|
|
public int dZ() {
|
|
|
|
return this.isHandRaised() ? this.activeItem.k() - this.dY() : 0;
|
2018-06-29 04:55:29 +00:00
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
2020-06-25 14:09:55 +00:00
|
|
|
index 38eb8fbac1d5131249dd9ba8b9942b4c85de2c7f..bbe6188f50dd3c456dec5c3239bdcffbfceb3589 100644
|
2018-06-29 04:55:29 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
2020-06-25 14:09:55 +00:00
|
|
|
@@ -667,5 +667,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
2018-06-29 04:55:29 +00:00
|
|
|
public void setShieldBlockingDelay(int delay) {
|
|
|
|
getHandle().setShieldBlockingDelay(delay);
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public ItemStack getActiveItem() {
|
2018-07-22 05:27:46 +00:00
|
|
|
+ return getHandle().activeItem.asBukkitMirror();
|
2018-06-29 04:55:29 +00:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public int getItemUseRemainingTime() {
|
|
|
|
+ return getHandle().getItemUseRemainingTime();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public int getHandRaisedTime() {
|
|
|
|
+ return getHandle().getHandRaisedTime();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean isHandRaised() {
|
|
|
|
+ return getHandle().isHandRaised();
|
|
|
|
+ }
|
|
|
|
// Paper end
|
|
|
|
}
|