mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-19 09:05:43 +01:00
8ed2992da9
Portion of diff was dropped in the mappings update commit. Also remove the option to remove invalid statistics. The server will automatically do this now as of... 1.13?, our option wasn't even doing anything.
67 lines
2.3 KiB
Diff
67 lines
2.3 KiB
Diff
From c8a0f617763aabdf82bf3856b5ca3b375deab1a5 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 8aef335a1..3e9af4481 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
|
@@ -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;
|
|
@@ -2689,10 +2689,12 @@ public abstract class EntityLiving extends Entity {
|
|
return this.activeItem;
|
|
}
|
|
|
|
+ public int getItemUseRemainingTime() { return cX(); } // Paper - OBFHELPER
|
|
public int cX() {
|
|
return this.bu;
|
|
}
|
|
|
|
+ public int getHandRaisedTime() { return cY(); } // Paper - OBFHELPER
|
|
public int cY() {
|
|
return this.isHandRaised() ? this.activeItem.k() - this.cX() : 0;
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
index 8e65bfc78..52834b6da 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
@@ -568,5 +568,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.20.0
|
|
|