2019-04-05 06:52:02 +02:00
|
|
|
From d08cc0efdc7a0ca77aff3772431825e6093e8eea Mon Sep 17 00:00:00 2001
|
2018-01-11 23:50:27 +01:00
|
|
|
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
|
2019-04-05 06:52:02 +02:00
|
|
|
index c7108e9c3..3d47b991a 100644
|
2018-01-11 23:50:27 +01:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2019-04-05 06:52:02 +02:00
|
|
|
@@ -412,4 +412,9 @@ public class PaperWorldConfig {
|
2018-07-21 23:24:18 +02:00
|
|
|
log("Max Chunk Gens Per Tick: " + maxChunkGensPerTick);
|
2018-01-11 23:50:27 +01:00
|
|
|
}
|
|
|
|
}
|
2018-07-18 20:55:52 +02:00
|
|
|
+
|
2018-01-11 23:50:27 +01:00
|
|
|
+ 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
|
2019-03-20 02:46:00 +01:00
|
|
|
index 1a347bae3..b9c76325d 100644
|
2018-01-11 23:50:27 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntitySquid.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntitySquid.java
|
2018-07-18 20:55:52 +02:00
|
|
|
@@ -167,7 +167,10 @@ public class EntitySquid extends EntityWaterAnimal {
|
2018-01-11 23:50:27 +01:00
|
|
|
}
|
|
|
|
|
2018-08-26 20:11:49 +02:00
|
|
|
public boolean a(GeneratorAccess generatoraccess, boolean flag) {
|
2018-07-18 20:55:52 +02:00
|
|
|
- return this.locY > this.world.spigotConfig.squidSpawnRangeMin && this.locY < (double) generatoraccess.getSeaLevel(); // Spigot
|
2018-01-11 23:50:27 +01:00
|
|
|
+ // Paper - Make max spawn height configurable
|
|
|
|
+ final double maxHeight = world.paperConfig.squidMaxSpawnHeight > 0 ? world.paperConfig.squidMaxSpawnHeight : world.getSeaLevel();
|
2018-07-18 20:55:52 +02:00
|
|
|
+ return this.locY > this.world.spigotConfig.squidSpawnRangeMin && this.locY < maxHeight; // Spigot
|
|
|
|
+ // Paper end
|
2018-01-11 23:50:27 +01:00
|
|
|
}
|
|
|
|
|
2018-07-18 20:55:52 +02:00
|
|
|
public void c(float f, float f1, float f2) {
|
2018-01-11 23:50:27 +01:00
|
|
|
--
|
2019-03-20 02:46:00 +01:00
|
|
|
2.21.0
|
2018-01-11 23:50:27 +01:00
|
|
|
|