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

48 lines
1.8 KiB
Diff
Raw Normal View History

2020-09-11 07:00:00 +10:00
From d34995746893268973a258df789947d1eafaae5c 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
2020-09-11 07:00:00 +10:00
index 59f1ff269..3b957cab1 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
2020-08-12 07:00:00 +10:00
@@ -131,7 +131,7 @@ public class EntityItem extends Entity {
2016-11-17 12:41:12 +11:00
}
}
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;
2020-09-11 07:00:00 +10:00
@@ -451,7 +451,7 @@ public class EntityItem extends Entity {
2019-12-11 09:00:00 +11:00
public void s() {
this.o();
- this.age = 5999;
+ this.age = world.spigotConfig.itemDespawnRate - 1; // Spigot
}
2019-04-23 12:00:00 +10:00
@Override
2014-04-12 14:18:37 +10:00
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
2020-01-22 08:00:00 +11:00
index 03deec359..7dd66b48e 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
@@ -168,4 +168,11 @@ public class SpigotWorldConfig
2018-08-06 10:32:15 +10:00
mobSpawnRange = (byte) getInt( "mob-spawn-range", 6 );
2016-03-01 08:33:06 +11:00
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 );
+ }
}
--
2.25.1
2014-04-12 14:18:37 +10:00