2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 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
|
|
|
|
|
2021-11-23 15:03:50 +01:00
|
|
|
#NOTE: Spigot removed the min option, Vanilla now has the same spawn rule for all ambient water animals
|
2021-06-11 14:02:28 +02:00
|
|
|
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
|
2021-11-09 08:59:15 +01:00
|
|
|
index e2894138d3efb32161087ad2a1093b8c15c56a65..5892823425055efb92bf635b035d62981942b966 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2021-11-09 08:59:15 +01:00
|
|
|
@@ -383,4 +383,9 @@ public class PaperWorldConfig {
|
2021-06-12 17:06:20 +02:00
|
|
|
disableCreeperLingeringEffect = getBoolean("disable-creeper-lingering-effect", false);
|
|
|
|
log("Creeper lingering effect: " + disableCreeperLingeringEffect);
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ public double squidMaxSpawnHeight;
|
|
|
|
+ private void squidMaxSpawnHeight() {
|
|
|
|
+ squidMaxSpawnHeight = getDouble("squid-spawn-height.maximum", 0.0D);
|
|
|
|
+ }
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
|
2021-11-23 16:04:41 +01:00
|
|
|
index 3ffc1ee8a9ae63c8678c12736fab5d6ba0a21a5b..4da560f6e4da0750bda78b900b2d916d58adfccb 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
|
2021-11-23 16:04:41 +01:00
|
|
|
@@ -211,7 +211,8 @@ public class Squid extends WaterAnimal {
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
2021-11-23 16:04:41 +01:00
|
|
|
|
|
|
|
public static boolean checkSquidSpawnRules(EntityType<Squid> type, LevelAccessor world, MobSpawnType spawnReason, BlockPos pos, Random random) {
|
|
|
|
- return pos.getY() > world.getMinecraftWorld().spigotConfig.squidSpawnRangeMin && pos.getY() < world.getSeaLevel(); // Spigot
|
|
|
|
+ final double maxHeight = world.getMinecraftWorld().paperConfig.squidMaxSpawnHeight > 0 ? world.getMinecraftWorld().paperConfig.squidMaxSpawnHeight : world.getSeaLevel(); // Paper
|
|
|
|
+ return pos.getY() > world.getMinecraftWorld().spigotConfig.squidSpawnRangeMin && pos.getY() < maxHeight; // Spigot // Paper
|
|
|
|
}
|
|
|
|
|
2021-06-12 17:06:20 +02:00
|
|
|
@Override
|