spigot/CraftBukkit-Patches/0013-Item-Despawn-Rate.patch

39 lines
1.6 KiB
Diff
Raw Normal View History

2016-06-09 11:43:56 +10:00
From dd840f97d12d1e75db43ef747990af7c98bc20f7 Mon Sep 17 00:00:00 2001
2014-04-12 14:18:37 +10:00
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
2016-06-09 11:43:56 +10:00
index f5ca08f..4b6415c 100644
2014-04-12 14:18:37 +10:00
--- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java
2016-06-09 11:43:56 +10:00
@@ -113,7 +113,7 @@ public class EntityItem extends Entity {
2016-03-01 08:33:06 +11:00
// Craftbukkit end */
2015-02-28 11:36:22 +00:00
2016-06-09 11:43:56 +10:00
this.ak();
2015-02-28 11:36:22 +00:00
- if (!this.world.isClientSide && this.age >= 6000) {
+ if (!this.world.isClientSide && this.age >= world.spigotConfig.itemDespawnRate) { // Spigot
2014-04-12 14:18:37 +10:00
// 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
2016-03-01 08:33:06 +11:00
index cacb8fc..ca888fc 100644
2014-04-12 14:18:37 +10:00
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
2016-03-01 08:33:06 +11:00
@@ -129,4 +129,11 @@ public class SpigotWorldConfig
mobSpawnRange = (byte) getInt( "mob-spawn-range", 4 );
log( "Mob Spawn Range: " + mobSpawnRange );
2014-04-12 14:18:37 +10:00
}
+
+ public int itemDespawnRate;
+ private void itemDespawnRate()
+ {
+ itemDespawnRate = getInt( "item-despawn-rate", 6000 );
+ log( "Item Despawn Rate: " + itemDespawnRate );
+ }
}
--
2016-05-10 21:48:25 +10:00
2.7.4
2014-04-12 14:18:37 +10:00