geforkt von Mirrors/Paper
ec9fa36908
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 149527f7 SPIGOT-5782: Set Arrow Launched From Crossbow CraftBukkit Changes:be6aaf04SPIGOT-5782: Set Arrow Launched From Crossbow833da9c4SPIGOT-5799: InventoryCloseEvent fires after PlayerQuitEvent26c0084fSPIGOT-5675, SPIGOT-5798, MC-149563: Fix tracking of entities across dimensions7f3e7c3fSPIGOT-5797: Zombie(Villagers) Instant Convert based on their lifetime
64 Zeilen
2.4 KiB
Diff
64 Zeilen
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 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 2a567dca19034ed9071ef09b5371eabb5fff557c..d604728db71d4e61a11fb1ccb7f02b6f6b914a51 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
|
@@ -112,7 +112,7 @@ public abstract class EntityLiving extends Entity {
|
|
private float bB;
|
|
private int jumpTicks;
|
|
private float bD;
|
|
- protected ItemStack activeItem;
|
|
+ public ItemStack activeItem; // Paper - public
|
|
protected int bl;
|
|
protected int bm;
|
|
private BlockPosition bE;
|
|
@@ -2980,10 +2980,12 @@ public abstract class EntityLiving extends Entity {
|
|
return this.activeItem;
|
|
}
|
|
|
|
+ public int getItemUseRemainingTime() { return this.dE(); } // Paper - OBFHELPER
|
|
public int dE() {
|
|
return this.bl;
|
|
}
|
|
|
|
+ public int getHandRaisedTime() { return this.dF(); } // Paper - OBFHELPER
|
|
public int dF() {
|
|
return this.isHandRaised() ? this.activeItem.k() - this.dE() : 0;
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
index a8e44e95d6115833f4e20e6bb007842bdc52f1ef..3a87c6574bbad9e6c2d7573eb447194c931d7ec4 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
@@ -654,5 +654,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
|
|
}
|