2021-06-11 14:02:28 +02:00
|
|
|
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/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
|
2021-07-07 08:52:40 +02:00
|
|
|
index 8e2f3ffae0071be4f44c9b04269913d9daed2a4d..f8dcd9cb5e6d223f4f5445a4172cc6c4ea160313 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/Mob.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
|
2021-07-07 08:52:40 +02:00
|
|
|
@@ -774,16 +774,16 @@ public abstract class Mob extends LivingEntity {
|
2021-06-11 14:02:28 +02:00
|
|
|
int i = this.getType().getCategory().getDespawnDistance();
|
|
|
|
int j = i * i;
|
|
|
|
|
|
|
|
- if (d0 > (double) j) { // CraftBukkit - remove isTypeNotPersistent() check
|
|
|
|
+ if (d0 > (double) level.paperConfig.hardDespawnDistance) { // CraftBukkit - remove isTypeNotPersistent() check // Paper - custom despawn distances
|
2021-06-12 00:37:16 +02:00
|
|
|
this.discard();
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int k = this.getType().getCategory().getNoDespawnDistance();
|
|
|
|
int l = k * k;
|
|
|
|
|
|
|
|
- if (this.noActionTime > 600 && this.random.nextInt(800) == 0 && d0 > (double) l) { // CraftBukkit - remove isTypeNotPersistent() check
|
|
|
|
+ if (this.noActionTime > 600 && this.random.nextInt(800) == 0 && d0 > level.paperConfig.softDespawnDistance) { // CraftBukkit - remove isTypeNotPersistent() check // Paper - custom despawn distances
|
2021-06-12 00:37:16 +02:00
|
|
|
this.discard();
|
2021-06-11 14:02:28 +02:00
|
|
|
- } else if (d0 < (double) l) {
|
|
|
|
+ } else if (d0 < level.paperConfig.softDespawnDistance) { // Paper - custom despawn distances
|
|
|
|
this.noActionTime = 0;
|
|
|
|
}
|
|
|
|
}
|