From ece3cca682a0a75a61c356a94bad46367d6a0e80 Mon Sep 17 00:00:00 2001 From: Dmck2b Date: Mon, 7 Jul 2014 04:13:42 +0100 Subject: [PATCH] Add configurable despawn ranges for living entities --- ...-despawn-distances-for-living-entiti.patch | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 CraftBukkit-Patches/0025-Add-configurable-despawn-distances-for-living-entiti.patch diff --git a/CraftBukkit-Patches/0025-Add-configurable-despawn-distances-for-living-entiti.patch b/CraftBukkit-Patches/0025-Add-configurable-despawn-distances-for-living-entiti.patch new file mode 100644 index 00000000000..19339193394 --- /dev/null +++ b/CraftBukkit-Patches/0025-Add-configurable-despawn-distances-for-living-entiti.patch @@ -0,0 +1,55 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Suddenly +Date: Mon, 7 Jul 2014 04:11:34 +0100 +Subject: [PATCH] Add configurable despawn distances for living entities + + +diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/net/minecraft/server/EntityInsentient.java ++++ b/src/main/java/net/minecraft/server/EntityInsentient.java +@@ -0,0 +0,0 @@ public abstract class EntityInsentient extends EntityLiving { + double d2 = entityhuman.locZ - this.locZ; + double d3 = d0 * d0 + d1 * d1 + d2 * d2; + +- if (d3 > 16384.0D) { // CraftBukkit - remove isTypeNotPersistent() check ++ if (d3 > this.world.paperSpigotConfig.hardDespawnDistance) { // CraftBukkit - remove isTypeNotPersistent() check // PaperSpigot - custom despawn distances + this.die(); + } + +- if (this.aU > 600 && this.random.nextInt(800) == 0 && d3 > 1024.0D) { // CraftBukkit - remove isTypeNotPersistent() check ++ if (this.aU > 600 && this.random.nextInt(800) == 0 && d3 > this.world.paperSpigotConfig.softDespawnDistance) { // CraftBukkit - remove isTypeNotPersistent() check // PaperSpigot - custom despawn distances + this.die(); +- } else if (d3 < 1024.0D) { ++ } else if (d3 < this.world.paperSpigotConfig.softDespawnDistance) { // PaperSpigot - custom despawn distances + this.aU = 0; + } + } +diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java ++++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +@@ -0,0 +0,0 @@ public class PaperSpigotWorldConfig + playerExhaustionAttack = getFloat( "player-exhaustion.attack", 0.3F ); + playerExhaustionRegeneration = getFloat( "player-exhaustion.regeneration", 3.0F ); + } ++ ++ public Integer softDespawnDistance; ++ public Integer hardDespawnDistance; ++ private void despawnDistances() ++ { ++ softDespawnDistance = getInt( "despawn-ranges.soft", 32 ); // 32^2 = 1024, Minecraft Default ++ hardDespawnDistance = getInt( "despawn-ranges.hard", 128 ); // 128^2 = 16384, Minecraft Default; ++ ++ if ( softDespawnDistance > hardDespawnDistance) ++ { ++ softDespawnDistance = hardDespawnDistance; ++ } ++ ++ log( "Living Entity Despawn Ranges: Soft: " + softDespawnDistance + " Hard: " + hardDespawnDistance ); ++ ++ softDespawnDistance = softDespawnDistance*softDespawnDistance; ++ hardDespawnDistance = hardDespawnDistance*hardDespawnDistance; ++ } + } +-- \ No newline at end of file