From f07fd6b18c525b635c99a3390a5f83361cb640fa Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 12:45:11 -0600 Subject: [PATCH] Configurable squid spawn ranges diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java index ca6d1a2..ac7a176 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -63,4 +63,12 @@ public class PaperWorldConfig { config.addDefault("world-settings.default." + path, def); return config.getString("world-settings." + worldName + "." + path, config.getString("world-settings.default." + path)); } + + public double squidMinSpawnHeight; + public double squidMaxSpawnHeight; + private void squidSpawnHeights() { + squidMinSpawnHeight = getDouble("squid-spawn-height.minimum", 45.0D); + squidMaxSpawnHeight = getDouble("squid-spawn-height.maximum", 63.0D); + log("Squids will spawn between Y: " + squidMinSpawnHeight + " and Y: " + squidMaxSpawnHeight); + } } diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java index b94444d..9f1a50e 100644 --- a/src/main/java/net/minecraft/server/EntitySquid.java +++ b/src/main/java/net/minecraft/server/EntitySquid.java @@ -138,7 +138,8 @@ public class EntitySquid extends EntityWaterAnimal { } public boolean cF() { - return this.locY > 45.0D && this.locY < (double) this.world.K() && super.cF(); + // Paper - Configurable squid spawn height range + return this.locY > world.paperConfig.squidMinSpawnHeight && this.locY < world.paperConfig.squidMaxSpawnHeight && super.cF(); } public void b(float f, float f1, float f2) { -- 2.7.2