mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-09 06:50:32 +08:00
d089acb3bd
ForgeFlower is better than Spigots FernFlower at decompiling the source. However, in order to maintain the CraftBukkit patches, we must keep using spigots for the primary. However, for any file that we import on top of Spigots imported files there is nothing stopping us from using better decompiled files. So these changes will use ForgeFlower to maintain a better set of decomped files, so anything we add on top of Paper can start off in a better spot.
56 lines
2.8 KiB
Diff
56 lines
2.8 KiB
Diff
From 96a39a206b1aa7c7e2352d77ddde5cac303fc270 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 341038fc4d..3e1f4be10f 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -92,4 +92,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/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
|
|
index cc74150dae..9e95ede7fe 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
|
|
@@ -626,13 +626,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.18.0
|
|
|