From 4303c3b48d4c269f3617be2c150b6357c31032a5 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Thu, 11 Jan 2018 16:50:27 -0600
Subject: [PATCH] Re-add config option for max squid spawn height

Apparently not only do people actually use it, but upstream missed it.
---
 ...-max-squid-spawn-height-configurable.patch | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 Spigot-Server-Patches/Make-max-squid-spawn-height-configurable.patch

diff --git a/Spigot-Server-Patches/Make-max-squid-spawn-height-configurable.patch b/Spigot-Server-Patches/Make-max-squid-spawn-height-configurable.patch
new file mode 100644
index 0000000000..d252bcf95c
--- /dev/null
+++ b/Spigot-Server-Patches/Make-max-squid-spawn-height-configurable.patch
@@ -0,0 +1,38 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Zach Brown <1254957+zachbr@users.noreply.github.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
+@@ -0,0 +0,0 @@ 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
+@@ -0,0 +0,0 @@ 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) {
+--
\ No newline at end of file