mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-04 18:55:07 +02:00
23 lines
1.0 KiB
Diff
23 lines
1.0 KiB
Diff
|
From 7b2b7b222801b793995cbc5b917933a50a47c772 Mon Sep 17 00:00:00 2001
|
||
|
|
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
|
||
|
|
index e723bd339..cf00d0c88 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/EntityItem.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/EntityItem.java
|
||
|
|
@@ -58,6 +58,7 @@ public class EntityItem extends Entity {
|
||
|
|
// 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
|
||
|
|
--
|
||
|
|
2.21.0
|
||
|
|
|