58 lines
2.9 KiB
Diff
58 lines
2.9 KiB
Diff
|
From 945f1b620750fff14a25936a47aa5eae2f336a7c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Suddenly <suddenly@suddenly.coffee>
|
||
|
|
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 99e7b2b..70de8b6 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
|
||
|
|
@@ -382,13 +382,13 @@ 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 dec078a..e627c4e 100644
|
||
|
|
--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
|
||
|
|
+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
|
||
|
|
@@ -144,4 +144,22 @@ 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;
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
--
|
||
|
|
1.9.1
|
||
|
|
|