mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-09 13:28:36 +02:00
Portion of diff was dropped in the mappings update commit. Also remove the option to remove invalid statistics. The server will automatically do this now as of... 1.13?, our option wasn't even doing anything.
42 lines
1.8 KiB
Diff
42 lines
1.8 KiB
Diff
From 4fbd76666feb1e20f70b79f9deb27fb273113035 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 695bdf2e6..313dd9891 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -404,4 +404,9 @@ public class PaperWorldConfig {
|
|
log("Max Chunk Gens Per Tick: " + maxChunkGensPerTick);
|
|
}
|
|
}
|
|
+
|
|
+ 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 b4ee0a9c7..a5edc5bc2 100644
|
|
--- a/src/main/java/net/minecraft/server/EntitySquid.java
|
|
+++ b/src/main/java/net/minecraft/server/EntitySquid.java
|
|
@@ -167,7 +167,10 @@ public class EntitySquid extends EntityWaterAnimal {
|
|
}
|
|
|
|
public boolean a(GeneratorAccess generatoraccess, boolean flag) {
|
|
- return this.locY > this.world.spigotConfig.squidSpawnRangeMin && this.locY < (double) generatoraccess.getSeaLevel(); // 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; // Spigot
|
|
+ // Paper end
|
|
}
|
|
|
|
public void c(float f, float f1, float f2) {
|
|
--
|
|
2.20.0
|
|
|