56 lines
2.8 KiB
Diff
56 lines
2.8 KiB
Diff
|
From ba115e8f3764ef9162fba23d75154d9d5bb0054e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Suddenly <suddenly@suddenly.coffee>
|
||
|
|
Date: Tue, 1 Mar 2016 13:51:54 -0600
|
||
|
|
Subject: [PATCH] Add configurable despawn distances for living entities
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
index d5b4756..a662f26 100644
|
||
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
@@ -103,4 +103,20 @@ public class PaperWorldConfig {
|
||
|
|
log("Player exhaustion penalty for breaking blocks is " + blockBreakExhaustion);
|
||
|
|
log("Player exhaustion penalty for swimming is " + playerSwimmingExhaustion);
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ public int softDespawnDistance;
|
||
|
|
+ public int 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;
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
|
||
|
|
index a45e87c..916c913 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
|
||
|
|
@@ -608,13 +608,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 > world.paperConfig.hardDespawnDistance) { // CraftBukkit - remove isTypeNotPersistent() check // Paper - custom despawn distances
|
||
|
|
this.die();
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (this.ticksFarFromPlayer > 600 && this.random.nextInt(800) == 0 && d3 > 1024.0D) { // CraftBukkit - remove isTypeNotPersistent() check
|
||
|
|
+ if (this.ticksFarFromPlayer > 600 && this.random.nextInt(800) == 0 && d3 > world.paperConfig.softDespawnDistance) { // CraftBukkit - remove isTypeNotPersistent() check // Paper - custom despawn distances
|
||
|
|
this.die();
|
||
|
|
- } else if (d3 < 1024.0D) {
|
||
|
|
+ } else if (d3 < world.paperConfig.softDespawnDistance) { // Paper - custom despawn distances
|
||
|
|
this.ticksFarFromPlayer = 0;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.7.2
|
||
|
|
|