From a1b0dffb199b255bf40353045713ed318bf6ca10 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 14 Feb 2015 20:16:45 -0600 Subject: [PATCH] Remove upstream-pulled patch --- ...n-items-outside-EAR-activation-range.patch | 32 ------------------- ...-block-they-re-holding-when-they-di.patch} | 0 2 files changed, 32 deletions(-) delete mode 100644 Spigot-Server-Patches/0044-Despawn-items-outside-EAR-activation-range.patch rename Spigot-Server-Patches/{0045-Enderman-drop-the-block-they-re-holding-when-they-di.patch => 0044-Enderman-drop-the-block-they-re-holding-when-they-di.patch} (100%) diff --git a/Spigot-Server-Patches/0044-Despawn-items-outside-EAR-activation-range.patch b/Spigot-Server-Patches/0044-Despawn-items-outside-EAR-activation-range.patch deleted file mode 100644 index a95ba66..0000000 --- a/Spigot-Server-Patches/0044-Despawn-items-outside-EAR-activation-range.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 823f654e472c921489a122be8373f253aac0b3bb Mon Sep 17 00:00:00 2001 -From: Bestle -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 - diff --git a/Spigot-Server-Patches/0045-Enderman-drop-the-block-they-re-holding-when-they-di.patch b/Spigot-Server-Patches/0044-Enderman-drop-the-block-they-re-holding-when-they-di.patch similarity index 100% rename from Spigot-Server-Patches/0045-Enderman-drop-the-block-they-re-holding-when-they-di.patch rename to Spigot-Server-Patches/0044-Enderman-drop-the-block-they-re-holding-when-they-di.patch