mirror of https://github.com/PaperMC/Paper.git
28 lines
1.7 KiB
Diff
28 lines
1.7 KiB
Diff
|
From 0000000000000000000000000000000000000000 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/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
|
||
|
index d97e12a2dca072ae102b029fb67472dacc2c5b40..f0e6375236d61f32235ed23c3bae49db1545d1a2 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
|
||
|
|
@@ -148,6 +148,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
|
||
|
|
// 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
|
||
|
|
@@ -233,6 +234,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
|
||
|
|
// 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
|