41 lines
1.7 KiB
Diff
41 lines
1.7 KiB
Diff
|
From 9012640b501046e64eb77f1f28fd1b246832465d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||
|
|
Date: Thu, 11 Jan 2018 16:47:28 -0600
|
||
|
|
Subject: [PATCH] Make max squid spawn height configurable
|
||
|
|
|
||
|
|
I don't know why upstream made only the minimum height configurable but
|
||
|
|
whatever
|
||
|
|
|
||
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
index 964bf2d2..f3e2aee1 100644
|
||
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
@@ -471,4 +471,9 @@ public class PaperWorldConfig {
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
+ public double squidMaxSpawnHeight;
|
||
|
|
+ private void squidMaxSpawnHeight() {
|
||
|
|
+ squidMaxSpawnHeight = getDouble("squid-spawn-height.maximum", 0.0D);
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
|
||
|
|
index 0ce16be6..58a90283 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/EntitySquid.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/EntitySquid.java
|
||
|
|
@@ -141,7 +141,9 @@ public class EntitySquid extends EntityWaterAnimal {
|
||
|
|
}
|
||
|
|
|
||
|
|
public boolean P() {
|
||
|
|
- return this.locY > this.world.spigotConfig.squidSpawnRangeMin && this.locY < (double) this.world.getSeaLevel() && super.P(); // Spigot
|
||
|
|
+ // Paper - Make max spawn height configurable
|
||
|
|
+ final double maxHeight = world.paperConfig.squidMaxSpawnHeight > 0 ? world.paperConfig.squidMaxSpawnHeight : world.getSeaLevel();
|
||
|
|
+ return this.locY > this.world.spigotConfig.squidSpawnRangeMin && this.locY < maxHeight && super.P(); // Spigot
|
||
|
|
}
|
||
|
|
|
||
|
|
public void b(float f, float f1, float f2) {
|
||
|
|
--
|
||
|
|
2.14.3
|
||
|
|
|