2020-05-06 09:48:49 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2019-03-24 22:12:56 +00:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
|
Date: Sun, 24 Mar 2019 18:09:20 -0400
|
|
|
|
|
Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items
|
|
|
|
|
|
|
|
|
|
vanilla checks for == 0
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
|
2020-06-25 14:09:55 +00:00
|
|
|
index aad23b2c6cd674e05e609c4c019205978c6741f2..465550656356394074ebf4cc8d6188455daded88 100644
|
2019-03-24 22:12:56 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityItem.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityItem.java
|
2019-12-12 16:20:43 +00:00
|
|
|
@@ -60,6 +60,7 @@ public class EntityItem extends Entity {
|
2019-03-24 22:12:56 +00:00
|
|
|
// CraftBukkit start - Use wall time for pickup and despawn timers
|
|
|
|
|
int elapsedTicks = MinecraftServer.currentTick - this.lastTick;
|
|
|
|
|
if (this.pickupDelay != 32767) this.pickupDelay -= elapsedTicks;
|
|
|
|
|
+ this.pickupDelay = Math.max(0, this.pickupDelay); // Paper - don't go below 0
|
|
|
|
|
if (this.age != -32768) this.age += elapsedTicks;
|
|
|
|
|
this.lastTick = MinecraftServer.currentTick;
|
|
|
|
|
// CraftBukkit end
|
2020-06-25 14:09:55 +00:00
|
|
|
@@ -147,6 +148,7 @@ public class EntityItem extends Entity {
|
2019-03-24 22:15:39 +00:00
|
|
|
// CraftBukkit start - Use wall time for pickup and despawn timers
|
|
|
|
|
int elapsedTicks = MinecraftServer.currentTick - this.lastTick;
|
|
|
|
|
if (this.pickupDelay != 32767) this.pickupDelay -= elapsedTicks;
|
|
|
|
|
+ this.pickupDelay = Math.max(0, this.pickupDelay); // Paper - don't go below 0
|
|
|
|
|
if (this.age != -32768) this.age += elapsedTicks;
|
|
|
|
|
this.lastTick = MinecraftServer.currentTick;
|
|
|
|
|
// CraftBukkit end
|
