19972e09b8
5a0150f586ed3eb15fe6f1f596d1a5a7d806f0f9 Fix ITEM_BREAK e6a3911057bd94d8bd7021cbb4923fb84fb106d1 Upstream merge d1cdcf8d4c3639f956474f02ed662517cffbe23e Remove old patch 068df64aeee368377e1673667bffc7a6dcf90554 Rebuild all patches
38 lines
1.6 KiB
Diff
38 lines
1.6 KiB
Diff
From 7095785388e597a8ffd61ae0358bfcc0d6aa325b Mon Sep 17 00:00:00 2001
|
|
From: md_5 <md_5@live.com.au>
|
|
Date: Sun, 22 Sep 2013 19:10:53 +1000
|
|
Subject: [PATCH] Item Despawn Rate
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
|
|
index 7f16401..e35f78f 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityItem.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityItem.java
|
|
@@ -108,7 +108,7 @@ public class EntityItem extends Entity {
|
|
// Craftbukkit end */
|
|
|
|
this.W();
|
|
- if (!this.world.isStatic && this.age >= 6000) {
|
|
+ if (!this.world.isStatic && this.age >= world.spigotConfig.itemDespawnRate) { // Spigot
|
|
// CraftBukkit start - fire ItemDespawnEvent
|
|
if (org.bukkit.craftbukkit.event.CraftEventFactory.callItemDespawnEvent(this).isCancelled()) {
|
|
this.age = 0;
|
|
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
|
index 48ae475..6d31363 100644
|
|
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
|
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
|
@@ -198,4 +198,11 @@ public class SpigotWorldConfig
|
|
log( "*** WARNING *** Please use this option with caution, SpigotMC is not responsible for any issues this option may cause in the future!" );
|
|
}
|
|
}
|
|
+
|
|
+ public int itemDespawnRate;
|
|
+ private void itemDespawnRate()
|
|
+ {
|
|
+ itemDespawnRate = getInt( "item-despawn-rate", 6000 );
|
|
+ log( "Item Despawn Rate: " + itemDespawnRate );
|
|
+ }
|
|
}
|
|
--
|
|
2.1.0
|
|
|