Skip to content

Commit

Permalink
Make Item tick vanilla (#146 and #144)
Browse files Browse the repository at this point in the history
  • Loading branch information
s-yh-china committed Oct 30, 2023
1 parent b08ac8c commit 4e178db
Showing 1 changed file with 29 additions and 0 deletions.
29 changes: 29 additions & 0 deletions patches/server/0127-Make-Item-tick-vanilla.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: violetc <[email protected]>
Date: Mon, 30 Oct 2023 10:43:44 +0800
Subject: [PATCH] Make Item tick vanilla


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 5eb9d599e2f6e61adb34c991fe9008859633fdfc..862e99ddfcc1216ea4b5a7f12efc1a67ac839674 100644
--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
@@ -233,6 +233,9 @@ public class ItemEntity extends Entity implements TraceableEntity {
// Spigot start - copied from above
@Override
public void inactiveTick() {
+ // Leaves start - vanilla
+ this.tick();
+ /*
// CraftBukkit start - Use wall time for pickup and despawn timers
int elapsedTicks = MinecraftServer.currentTick - this.lastTick;
if (this.pickupDelay != 32767) this.pickupDelay -= elapsedTicks;
@@ -250,6 +253,8 @@ public class ItemEntity extends Entity implements TraceableEntity {
// CraftBukkit end
this.discard();
}
+ */
+ // Leaves end - vanilla
}
// Spigot end

0 comments on commit 4e178db

Please sign in to comment.