From adf7f18a6b1352b04895456560a6dde503851639 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 22 Jun 2014 15:32:38 -0500 Subject: [PATCH] Configurable squid spawn ranges --- ...0154-Configurable-squid-spawn-ranges.patch | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 CraftBukkit-Patches/0154-Configurable-squid-spawn-ranges.patch diff --git a/CraftBukkit-Patches/0154-Configurable-squid-spawn-ranges.patch b/CraftBukkit-Patches/0154-Configurable-squid-spawn-ranges.patch new file mode 100644 index 000000000..294d0a553 --- /dev/null +++ b/CraftBukkit-Patches/0154-Configurable-squid-spawn-ranges.patch @@ -0,0 +1,49 @@ +From d3a916cb61e990cbecccc77b25e1e29c47d73217 Mon Sep 17 00:00:00 2001 +From: Zach Brown +Date: Mon, 19 May 2014 19:30:58 -0500 +Subject: [PATCH] Configurable squid spawn ranges + + +diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java +index 493b3d8..1282544 100644 +--- a/src/main/java/net/minecraft/server/EntitySquid.java ++++ b/src/main/java/net/minecraft/server/EntitySquid.java +@@ -2,6 +2,8 @@ package net.minecraft.server; + + import org.bukkit.craftbukkit.TrigMath; // CraftBukkit + ++import org.spigotmc.SpigotWorldConfig; // PaperSpigot ++ + public class EntitySquid extends EntityWaterAnimal { + + public float bp; +@@ -146,6 +148,6 @@ public class EntitySquid extends EntityWaterAnimal { + } + + public boolean canSpawn() { +- return this.locY > 45.0D && this.locY < 63.0D && super.canSpawn(); ++ return this.locY > SpigotWorldConfig.squidMinSpawnHeight && this.locY < SpigotWorldConfig.squidMaxSpawnHeight && super.canSpawn(); // PaperSpigot - Configurable squid spawn height range + } + } +diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java +index 4a6edad..f9f8c05 100644 +--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java ++++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java +@@ -206,6 +206,14 @@ public class SpigotWorldConfig + log( "Hopper Transfer: " + hopperTransfer + " Hopper Check: " + hopperCheck + " Hopper Amount: " + hopperAmount ); + } + ++ public static double squidMinSpawnHeight; ++ public static double squidMaxSpawnHeight; ++ private void squidSpawnHeight() ++ { ++ squidMinSpawnHeight = getDouble( "squid-spawn-height.minimum", 45.0D ); ++ squidMaxSpawnHeight = getDouble( "squid-spawn-height.maximum", 63.0D ); ++ } ++ + public boolean randomLightUpdates; + private void lightUpdates() + { +-- +1.9.1 +