Commits

md_5 authored 850da7e0741
SPIGOT-2724: Improve /give for non default item-despawn-rate
No tags

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

Modified
1 -From 96b22ce0141217f2b2df535b0c2168a5bb0447fc Mon Sep 17 00:00:00 2001
1 +From 5fbd24c9097f1945ffc69d252dd7a0adcdbf627e Mon Sep 17 00:00:00 2001
2 2 From: md_5 <md_5@live.com.au>
3 3 Date: Sun, 22 Sep 2013 19:10:53 +1000
4 4 Subject: [PATCH] Item Despawn Rate
5 5
6 6
7 7 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
8 -index f5ca08f..4b6415c 100644
8 +index f5ca08f..145996b 100644
9 9 --- a/src/main/java/net/minecraft/server/EntityItem.java
10 10 +++ b/src/main/java/net/minecraft/server/EntityItem.java
11 11 @@ -113,7 +113,7 @@ public class EntityItem extends Entity {
12 12 // Craftbukkit end */
13 13
14 14 this.ak();
15 15 - if (!this.world.isClientSide && this.age >= 6000) {
16 16 + if (!this.world.isClientSide && this.age >= world.spigotConfig.itemDespawnRate) { // Spigot
17 17 // CraftBukkit start - fire ItemDespawnEvent
18 18 if (org.bukkit.craftbukkit.event.CraftEventFactory.callItemDespawnEvent(this).isCancelled()) {
19 19 this.age = 0;
20 +@@ -434,6 +434,6 @@ public class EntityItem extends Entity {
21 +
22 + public void w() {
23 + this.s();
24 +- this.age = 5999;
25 ++ this.age = world.spigotConfig.itemDespawnRate - 1; // Spigot
26 + }
27 + }
20 28 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
21 29 index 3dee3ff..6a8b5cd 100644
22 30 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
23 31 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
24 32 @@ -133,4 +133,11 @@ public class SpigotWorldConfig
25 33 mobSpawnRange = (byte) getInt( "mob-spawn-range", 4 );
26 34 log( "Mob Spawn Range: " + mobSpawnRange );
27 35 }
28 36 +
29 37 + public int itemDespawnRate;
30 38 + private void itemDespawnRate()
31 39 + {
32 40 + itemDespawnRate = getInt( "item-despawn-rate", 6000 );
33 41 + log( "Item Despawn Rate: " + itemDespawnRate );
34 42 + }
35 43 }
36 44 --
37 -2.7.4
45 +2.9.3
38 46

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut