Paper/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch

53 lines
2.6 KiB
Diff
Raw Normal View History

2019-12-11 01:56:03 +01:00
From 489eaf7838b02a8c749d5b3322f22f58ae5f54ef Mon Sep 17 00:00:00 2001
2016-03-01 00:09:49 +01: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
2019-12-11 01:56:03 +01:00
index 6d6a68cb1..284568641 100644
2016-03-01 00:09:49 +01:00
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -97,4 +97,20 @@ public class PaperWorldConfig {
2016-11-17 03:23:38 +01:00
private void nerfedMobsShouldJump() {
nerfedMobsShouldJump = getBoolean("spawner-nerfed-mobs-should-jump", false);
2016-03-01 00:09:49 +01: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
2019-12-11 01:56:03 +01:00
index 25b613249..6e84d6532 100644
2016-03-01 00:09:49 +01:00
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
2019-12-11 01:56:03 +01:00
@@ -622,11 +622,11 @@ public abstract class EntityInsentient extends EntityLiving {
2019-04-24 03:00:24 +02:00
if (entityhuman != null) {
double d0 = entityhuman.h(this);
2016-03-01 00:09:49 +01:00
2019-04-24 03:00:24 +02:00
- if (d0 > 16384.0D) { // CraftBukkit - remove isTypeNotPersistent() check
+ if (d0 > world.paperConfig.hardDespawnDistance) { // CraftBukkit - remove isTypeNotPersistent() check // Paper - custom despawn distances
2016-03-01 00:09:49 +01:00
this.die();
}
2019-04-24 03:00:24 +02:00
- if (this.ticksFarFromPlayer > 600 && this.random.nextInt(800) == 0 && d0 > 1024.0D) { // 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
2016-03-01 00:09:49 +01:00
this.die();
2019-04-24 03:00:24 +02:00
} else if (d0 < 1024.0D) {
2016-03-01 00:09:49 +01:00
this.ticksFarFromPlayer = 0;
--
2019-12-11 01:56:03 +01:00
2.24.0
2016-03-01 00:09:49 +01:00