2020-05-06 09:48:49 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2016-02-29 23:09:49 +00:00
|
|
|
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
|
2020-11-12 04:58:42 +00:00
|
|
|
index 4982fd2842342fe9a37123e34af0040ec580cf2d..eb3185250812f5c2b2d24a2de6b2248d280b771e 100644
|
2016-02-29 23:09:49 +00:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2020-11-12 04:58:42 +00:00
|
|
|
@@ -98,4 +98,20 @@ public class PaperWorldConfig {
|
2016-11-17 02:23:38 +00:00
|
|
|
private void nerfedMobsShouldJump() {
|
|
|
|
nerfedMobsShouldJump = getBoolean("spawner-nerfed-mobs-should-jump", false);
|
2016-02-29 23:09:49 +00:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ 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
|
2020-11-12 04:58:42 +00:00
|
|
|
index 59af58e1aed678b8eac83f2346f5822aff700fb7..c80d7f72a55ae92587ba8a4618787fb712bdaf23 100644
|
2016-02-29 23:09:49 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
|
2020-06-25 09:27:25 +00:00
|
|
|
@@ -698,14 +698,14 @@ public abstract class EntityInsentient extends EntityLiving {
|
|
|
|
int i = this.getEntityType().e().f();
|
|
|
|
int j = i * i;
|
2016-02-29 23:09:49 +00:00
|
|
|
|
2020-06-25 09:27:25 +00:00
|
|
|
- if (d0 > (double) j) { // CraftBukkit - remove isTypeNotPersistent() check
|
|
|
|
+ if (d0 > (double) world.paperConfig.hardDespawnDistance) { // CraftBukkit - remove isTypeNotPersistent() check // Paper - custom despawn distances
|
2016-02-29 23:09:49 +00:00
|
|
|
this.die();
|
|
|
|
}
|
|
|
|
|
2020-06-25 09:27:25 +00:00
|
|
|
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
|
2019-04-24 01:00:24 +00:00
|
|
|
+ if (this.ticksFarFromPlayer > 600 && this.random.nextInt(800) == 0 && d0 > world.paperConfig.softDespawnDistance) { // CraftBukkit - remove isTypeNotPersistent() check // Paper - custom despawn distances
|
2016-02-29 23:09:49 +00:00
|
|
|
this.die();
|
2020-06-25 09:27:25 +00:00
|
|
|
} else if (d0 < (double) l) {
|
2016-02-29 23:09:49 +00:00
|
|
|
this.ticksFarFromPlayer = 0;
|