From 668e09602c41a7adb6f1ef0c14b8a3f0b4f9fced Mon Sep 17 00:00:00 2001 From: gIsForGravity Date: Sat, 30 Mar 2024 12:54:20 +1100 Subject: [PATCH] #1331: Add access to current item's remaining ticks --- .../net/minecraft/world/entity/EntityLiving.patch | 9 +++++++++ .../bukkit/craftbukkit/entity/CraftLivingEntity.java | 10 ++++++++++ 2 files changed, 19 insertions(+) diff --git a/nms-patches/net/minecraft/world/entity/EntityLiving.patch b/nms-patches/net/minecraft/world/entity/EntityLiving.patch index 811b4aa93..91705f576 100644 --- a/nms-patches/net/minecraft/world/entity/EntityLiving.patch +++ b/nms-patches/net/minecraft/world/entity/EntityLiving.patch @@ -33,6 +33,15 @@ public abstract class EntityLiving extends Entity implements Attackable { private static final Logger LOGGER = LogUtils.getLogger(); +@@ -214,7 +240,7 @@ + private int noJumpDelay; + private float absorptionAmount; + protected ItemStack useItem; +- protected int useItemRemaining; ++ public int useItemRemaining; + protected int fallFlyTicks; + private BlockPosition lastPos; + private Optional lastClimbablePos; @@ -225,7 +251,21 @@ private float swimAmount; private float swimAmountO; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java index f583788dc..fd3d0a676 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -258,6 +258,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { getHandle().maxAirTicks = ticks; } + @Override + public int getItemInUseTicks() { + return getHandle().getUseItemRemainingTicks(); + } + + @Override + public void setItemInUseTicks(int ticks) { + getHandle().useItemRemaining = ticks; + } + @Override public int getArrowCooldown() { return getHandle().removeArrowTime;