56 Zeilen
3.0 KiB
Diff
56 Zeilen
3.0 KiB
Diff
|
From 0000000000000000000000000000000000000000 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 b41e7922dd96c3358eb849ab39982a75736e3476..2f0d582baf0eb2bb477944d0cb1369db6ca33956 100644
|
||
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
@@ -102,4 +102,20 @@ public class PaperWorldConfig {
|
||
|
|
private void nerfedMobsShouldJump() {
|
||
|
|
nerfedMobsShouldJump = getBoolean("spawner-nerfed-mobs-should-jump", false);
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ 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/world/entity/EntityInsentient.java b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
|
||
|
|
index 28aa0a9361e8a32763d7fe1af060f0016e8c1e50..6e30fc88fa7a3ff00c9b4b78842c3a533649bd50 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/EntityInsentient.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
|
||
|
|
@@ -763,16 +763,16 @@ public abstract class EntityInsentient extends EntityLiving {
|
||
|
|
int i = this.getEntityType().e().f();
|
||
|
|
int j = i * i;
|
||
|
|
|
||
|
|
- if (d0 > (double) j) { // CraftBukkit - remove isTypeNotPersistent() check
|
||
|
|
+ if (d0 > (double) world.paperConfig.hardDespawnDistance) { // CraftBukkit - remove isTypeNotPersistent() check // Paper - custom despawn distances
|
||
|
|
this.die();
|
||
|
|
}
|
||
|
|
|
||
|
|
int k = this.getEntityType().e().g();
|
||
|
|
int l = k * k;
|
||
|
|
|
||
|
|
- if (this.ticksFarFromPlayer > 600 && this.random.nextInt(800) == 0 && d0 > (double) l) { // CraftBukkit - remove isTypeNotPersistent() check
|
||
|
|
+ if (this.ticksFarFromPlayer > 600 && this.random.nextInt(800) == 0 && d0 > world.paperConfig.softDespawnDistance) { // CraftBukkit - remove isTypeNotPersistent() check // Paper - custom despawn distances
|
||
|
|
this.die();
|
||
|
|
- } else if (d0 < (double) l) {
|
||
|
|
+ } else if (d0 < world.paperConfig.softDespawnDistance) { // Paper - custom despawn distances
|
||
|
|
this.ticksFarFromPlayer = 0;
|
||
|
|
}
|
||
|
|
}
|