2018-09-17 08:46:39 +02:00
|
|
|
From d0f62979bd534c691c6c0f9f7f29763881499a01 Mon Sep 17 00:00:00 2001
|
2018-06-29 06:55:29 +02: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
|
2018-09-17 08:46:39 +02:00
|
|
|
index a8f58a13f..c051200da 100644
|
2018-06-29 06:55:29 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
2018-07-22 07:27:46 +02:00
|
|
|
@@ -106,7 +106,7 @@ public abstract class EntityLiving extends Entity {
|
|
|
|
private float bI;
|
|
|
|
private int bJ;
|
|
|
|
private float bK;
|
|
|
|
- protected ItemStack activeItem;
|
|
|
|
+ public ItemStack activeItem; // Paper - public
|
|
|
|
protected int bu;
|
|
|
|
protected int bv;
|
|
|
|
private BlockPosition bL;
|
2018-09-17 08:46:39 +02:00
|
|
|
@@ -2692,10 +2692,12 @@ public abstract class EntityLiving extends Entity {
|
2018-06-29 06:55:29 +02:00
|
|
|
return this.activeItem;
|
|
|
|
}
|
|
|
|
|
2018-07-22 07:27:46 +02:00
|
|
|
+ public int getItemUseRemainingTime() { return cX(); } // Paper - OBFHELPER
|
|
|
|
public int cX() {
|
2018-07-19 01:16:19 +02:00
|
|
|
return this.bu;
|
2018-06-29 06:55:29 +02:00
|
|
|
}
|
|
|
|
|
2018-07-22 07:27:46 +02:00
|
|
|
+ public int getHandRaisedTime() { return cY(); } // Paper - OBFHELPER
|
|
|
|
public int cY() {
|
|
|
|
return this.isHandRaised() ? this.activeItem.k() - this.cX() : 0;
|
2018-06-29 06:55:29 +02:00
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
2018-09-17 08:46:39 +02:00
|
|
|
index a09cd0240..0860f2334 100644
|
2018-06-29 06:55:29 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
2018-08-02 04:49:47 +02:00
|
|
|
@@ -543,5 +543,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
2018-06-29 06:55:29 +02:00
|
|
|
public void setShieldBlockingDelay(int delay) {
|
|
|
|
getHandle().setShieldBlockingDelay(delay);
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public ItemStack getActiveItem() {
|
2018-07-22 07:27:46 +02:00
|
|
|
+ return getHandle().activeItem.asBukkitMirror();
|
2018-06-29 06:55:29 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public int getItemUseRemainingTime() {
|
|
|
|
+ return getHandle().getItemUseRemainingTime();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public int getHandRaisedTime() {
|
|
|
|
+ return getHandle().getHandRaisedTime();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean isHandRaised() {
|
|
|
|
+ return getHandle().isHandRaised();
|
|
|
|
+ }
|
|
|
|
// Paper end
|
|
|
|
}
|
|
|
|
--
|
2018-09-17 08:46:39 +02:00
|
|
|
2.19.0
|
2018-06-29 06:55:29 +02:00
|
|
|
|