Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-22 22:38:17 +01:00
66 Zeilen
3.3 KiB
Diff
66 Zeilen
3.3 KiB
Diff
From 9fce5b162ea77e577894a188678115c96e5f3021 Mon Sep 17 00:00:00 2001
|
|
From: Suddenly <suddenly@suddenly.coffee>
|
|
Date: Fri, 28 Nov 2014 01:49:53 -0600
|
|
Subject: [PATCH] Add configurable despawn distances for living entities
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
|
|
index 39800e5..4755489 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
|
|
@@ -432,13 +432,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 > this.world.paperSpigotConfig.hardDespawnDistance) { // CraftBukkit - remove isTypeNotPersistent() check // PaperSpigot - custom despawn distances
|
|
this.die();
|
|
}
|
|
|
|
- if (this.aO > 600 && this.random.nextInt(800) == 0 && d3 > 1024.0D) { // CraftBukkit - remove isTypeNotPersistent() check
|
|
+ if (this.aO > 600 && this.random.nextInt(800) == 0 && d3 > this.world.paperSpigotConfig.softDespawnDistance) { // CraftBukkit - remove isTypeNotPersistent() check // PaperSpigot - custom despawn distances
|
|
this.die();
|
|
- } else if (d3 < 1024.0D) {
|
|
+ } else if (d3 < this.world.paperSpigotConfig.softDespawnDistance) { // PaperSpigot - custom despawn distances
|
|
this.aO = 0;
|
|
}
|
|
}
|
|
diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
|
|
index 1b8683a..522a214 100644
|
|
--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
|
|
+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
|
|
@@ -103,7 +103,7 @@ public class PaperSpigotWorldConfig
|
|
private void blockGrowthHeight()
|
|
{
|
|
cactusMaxHeight = getInt( "max-growth-height.cactus", 3 );
|
|
- reedMaxHeight = getInt( "max-growth-height.reeds", 3 );
|
|
+ reedMaxHeight = getInt("max-growth-height.reeds", 3);
|
|
log( "Max height for cactus growth " + cactusMaxHeight + ". Max height for reed growth " + reedMaxHeight);
|
|
}
|
|
|
|
@@ -122,4 +122,21 @@ public class PaperSpigotWorldConfig
|
|
blockBreakExhaustion = getFloat( "player-exhaustion.block-break", 0.025F );
|
|
playerSwimmingExhaustion = getFloat("player-exhaustion.swimming", 0.015F );
|
|
}
|
|
+
|
|
+ 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;
|
|
+ }
|
|
}
|
|
--
|
|
1.9.1
|
|
|