37 lines
2.2 KiB
Diff
37 lines
2.2 KiB
Diff
|
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
|
||
|
|
|
||
|
|
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 6c692e58cde22003ecbf6dc5695799147c39905a..3c39f1bb3d88baaaed4dd43c51faeef89bb5c6c2 100644
|
||
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
@@ -348,4 +348,9 @@ public class PaperWorldConfig {
|
||
|
|
expMergeMaxValue = getInt("experience-merge-max-value", -1);
|
||
|
|
log("Experience Merge Max Value: " + expMergeMaxValue);
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ 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/EntitySquid.java b/src/main/java/net/minecraft/world/entity/animal/EntitySquid.java
|
||
|
|
index 3cc9af925aaf116140d5f36cfc56aa001ffb4e35..7ce5e2597b34d3a4d2a79d73c15e893c064fc88c 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/animal/EntitySquid.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/animal/EntitySquid.java
|
||
|
|
@@ -196,7 +196,8 @@ public class EntitySquid extends EntityWaterAnimal {
|
||
|
|
}
|
||
|
|
|
||
|
|
public static boolean b(EntityTypes<EntitySquid> entitytypes, GeneratorAccess generatoraccess, EnumMobSpawn enummobspawn, BlockPosition blockposition, Random random) {
|
||
|
|
- return blockposition.getY() > generatoraccess.getMinecraftWorld().spigotConfig.squidSpawnRangeMin && blockposition.getY() < generatoraccess.getSeaLevel(); // Spigot
|
||
|
|
+ final double maxHeight = generatoraccess.getMinecraftWorld().paperConfig.squidMaxSpawnHeight > 0 ? generatoraccess.getMinecraftWorld().paperConfig.squidMaxSpawnHeight : generatoraccess.getSeaLevel(); // Paper
|
||
|
|
+ return blockposition.getY() > generatoraccess.getMinecraftWorld().spigotConfig.squidSpawnRangeMin && blockposition.getY() < maxHeight; // Spigot // Paper
|
||
|
|
}
|
||
|
|
|
||
|
|
public void a(float f, float f1, float f2) {
|