Remove upstream-pulled patch

This commit is contained in:
Zach Brown 2015-02-14 20:16:45 -06:00
parent 3ea2235dbd
commit a1b0dffb19
2 changed files with 0 additions and 32 deletions

View File

@ -1,32 +0,0 @@
From 823f654e472c921489a122be8373f253aac0b3bb Mon Sep 17 00:00:00 2001
From: Bestle <tom.roberts00@gmail.com>
Date: Fri, 13 Feb 2015 14:33:17 -0600
Subject: [PATCH] Despawn items outside EAR activation range
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
index 659c45a..766874a 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -442,4 +442,18 @@ public class EntityItem extends Entity {
this.r();
this.age = 5999;
}
+
+ // PaperSpigot start - Despawn items outside of the EAR activation range
+ @Override
+ public void inactiveTick() {
+ this.age++;
+ if (!this.world.isStatic && this.age >= world.spigotConfig.itemDespawnRate) {
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callItemDespawnEvent(this).isCancelled()) {
+ this.age = 0;
+ return;
+ }
+ this.die();
+ }
+ }
+ // PaperSpigot end
}
--
2.3.0