From af58d5536efb873ec89f94f9d2d489a9d5dd6700 Mon Sep 17 00:00:00 2001 From: Melair Date: Wed, 29 Jul 2015 10:40:32 +0100 Subject: [PATCH] Ensure that inactiveTick on EntityItem obeys magic values for age and pickupDelay. --- CraftBukkit-Patches/0014-Entity-Activation-Range.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CraftBukkit-Patches/0014-Entity-Activation-Range.patch b/CraftBukkit-Patches/0014-Entity-Activation-Range.patch index 77b9b9ee7f..1856c56774 100644 --- a/CraftBukkit-Patches/0014-Entity-Activation-Range.patch +++ b/CraftBukkit-Patches/0014-Entity-Activation-Range.patch @@ -157,8 +157,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + public void inactiveTick() { + // CraftBukkit start - Use wall time for pickup and despawn timers + int elapsedTicks = MinecraftServer.currentTick - this.lastTick; -+ this.pickupDelay -= elapsedTicks; -+ this.age += elapsedTicks; ++ if (this.pickupDelay != 32767) this.pickupDelay -= elapsedTicks; ++ if (this.age != -32768) this.age += elapsedTicks; + this.lastTick = MinecraftServer.currentTick; + // CraftBukkit end +