core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-add config option for max squid spawn height 

Apparently not only do people actually use it, but upstream missed it.
This commit is contained in:
Zach Brown 2018-01-11 16:50:27 -06:00
parent d8c81d20d8
commit e6f92aecf3
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
3 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Spigot-Server-Patches/0014-Configurable-speed-for-water-flowing-over-lava.patch
View File

@ -1,4 +1,4 @@
From cb2a71023bfe9b8c9de796ca43cce768d2b4aa6a Mon Sep 17 00:00:00 2001
From 85d97e725560acd28f08c4398f9bd16ccc66ec7a Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Tue, 1 Mar 2016 14:27:13 -0600
Subject: [PATCH] Configurable speed for water flowing over lava

2
Spigot-Server-Patches/0015-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
View File

@ -1,4 +1,4 @@
From f1d0beef43c007994fc2f16ad9e5d7ab9d85d02b Mon Sep 17 00:00:00 2001
From 330ce044c0951d3829ed61953f64dc97072b8bb3 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 14:32:43 -0600
Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang

40
Spigot-Server-Patches/0261-Make-max-squid-spawn-height-configurable.patch Normal file
View File

@ -0,0 +1,40 @@
From 9012640b501046e64eb77f1f28fd1b246832465d 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 964bf2d2..f3e2aee1 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -471,4 +471,9 @@ public class PaperWorldConfig {
}
}
+ 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 0ce16be6..58a90283 100644
--- a/src/main/java/net/minecraft/server/EntitySquid.java
+++ b/src/main/java/net/minecraft/server/EntitySquid.java
@@ -141,7 +141,9 @@ public class EntitySquid extends EntityWaterAnimal {
}
public boolean P() {
- return this.locY > this.world.spigotConfig.squidSpawnRangeMin && this.locY < (double) this.world.getSeaLevel() && super.P(); // 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 && super.P(); // Spigot
}
public void b(float f, float f1, float f2) {
--
2.14.3