Add back cave lava see level configuration

PlazmaMC · May 26, 2024 · 7ef7531 · 7ef7531
1 parent d75427a
commit 7ef7531
Show file tree

Hide file tree

Showing 18 changed files with 4 additions and 4 deletions.
diff --git a/...24-Configurable-cave-lava-sea-level.patch → ...24-Configurable-cave-lava-sea-level.patch b/...24-Configurable-cave-lava-sea-level.patch → ...24-Configurable-cave-lava-sea-level.patch
@@ -26,7 +26,7 @@ index 8ce870a5341a61fbbaf42021ef7f7f615a6a3e09..e3990d5f5a49aca501289e92f7462a5f
          int i = settings.seaLevel();
          Aquifer.FluidStatus aquifer_b1 = new Aquifer.FluidStatus(i, settings.defaultFluid());
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index f7e4d14a7eaa3e35c9b03f3c6a01ae8712ded569..4f3ed01e12ccb8a6f1a5c4f605451bb36370a236 100644
+index e8e8c2d55b934b3043c1f83092b63dee1c5fcc4e..fd2544c52f0948f7dae14814fbf0310d8e49170d 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 @@ -35,6 +35,25 @@ public class GlobalConfiguration extends ConfigurationPart {

diff --git a/.../0024-Ignore-useless-entity-packets.patch → .../0025-Ignore-useless-entity-packets.patch b/.../0024-Ignore-useless-entity-packets.patch → .../0025-Ignore-useless-entity-packets.patch
diff --git a/...025-Configurable-entity-sensor-tick.patch → ...026-Configurable-entity-sensor-tick.patch b/...025-Configurable-entity-sensor-tick.patch → ...026-Configurable-entity-sensor-tick.patch
diff --git a/...026-Variable-entity-wakeup-duration.patch → ...027-Variable-entity-wakeup-duration.patch b/...026-Variable-entity-wakeup-duration.patch → ...027-Variable-entity-wakeup-duration.patch
diff --git a/...ver/0027-Optimise-state-lookup-more.patch → ...ver/0028-Optimise-state-lookup-more.patch b/...ver/0027-Optimise-state-lookup-more.patch → ...ver/0028-Optimise-state-lookup-more.patch
diff --git a/...ppress-errors-from-dirty-attributes.patch → ...ppress-errors-from-dirty-attributes.patch b/...ppress-errors-from-dirty-attributes.patch → ...ppress-errors-from-dirty-attributes.patch
diff --git a/...ver/0029-Skip-event-if-no-listeners.patch → ...ver/0030-Skip-event-if-no-listeners.patch b/...ver/0029-Skip-event-if-no-listeners.patch → ...ver/0030-Skip-event-if-no-listeners.patch
diff --git a/...030-Add-entity-spawn-deadlock-timer.patch → ...031-Add-entity-spawn-deadlock-timer.patch b/...030-Add-entity-spawn-deadlock-timer.patch → ...031-Add-entity-spawn-deadlock-timer.patch
diff --git a/patches/server/0031-Lithium-HashedList.patch → patches/server/0032-Lithium-HashedList.patch b/patches/server/0031-Lithium-HashedList.patch → patches/server/0032-Lithium-HashedList.patch
diff --git a/...rver/0032-Improve-SwingTime-ticking.patch → ...rver/0033-Improve-SwingTime-ticking.patch b/...rver/0032-Improve-SwingTime-ticking.patch → ...rver/0033-Improve-SwingTime-ticking.patch
diff --git a/.../0033-Save-Json-list-asynchronously.patch → .../0034-Save-Json-list-asynchronously.patch b/.../0033-Save-Json-list-asynchronously.patch → .../0034-Save-Json-list-asynchronously.patch
diff --git a/patches/server/0034-Add-more-MSPT.patch → patches/server/0035-Add-more-MSPT.patch b/patches/server/0034-Add-more-MSPT.patch → patches/server/0035-Add-more-MSPT.patch
diff --git a/...-Process-pathfinding-asynchronously.patch → ...-Process-pathfinding-asynchronously.patch b/...-Process-pathfinding-asynchronously.patch → ...-Process-pathfinding-asynchronously.patch
@@ -1285,10 +1285,10 @@ index 1c83926923f50fb4da1a83dc91614c20a831555f..aec2d0f9a957be65d031957dbff874d8
 
          Command.broadcastCommandMessage(sender, text("Successfully reloaded Plazma configuration files.", NamedTextColor.GREEN));
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index e8e8c2d55b934b3043c1f83092b63dee1c5fcc4e..c809a4692fcabf87c16fcd932ef25a718c2935d3 100644
+index fd2544c52f0948f7dae14814fbf0310d8e49170d..b18dfe9223b75d8a36b4b3a934625914f9a6a553 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -44,6 +44,26 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -63,6 +63,26 @@ public class GlobalConfiguration extends ConfigurationPart {
          boolean skipSqrWhenNoDeltaChanges = OPTIMIZE;
          public boolean spookyOptimize = OPTIMIZE;
 

diff --git a/...when-running-the-test-server-with-g.patch → ...when-running-the-test-server-with-g.patch b/...when-running-the-test-server-with-g.patch → ...when-running-the-test-server-with-g.patch
diff --git a/...nstead-if-server-favicon-doesn-t-ex.patch → ...nstead-if-server-favicon-doesn-t-ex.patch b/...nstead-if-server-favicon-doesn-t-ex.patch → ...nstead-if-server-favicon-doesn-t-ex.patch
diff --git a/...s/server/0038-Implement-FreedomChat.patch → ...s/server/0039-Implement-FreedomChat.patch b/...s/server/0038-Implement-FreedomChat.patch → ...s/server/0039-Implement-FreedomChat.patch
@@ -52,7 +52,7 @@ index c36ebab552c480d34e7fd48a45f0a320a97b9677..fdfe8f5bc5ad0e5f5ded41d87756a586
          player.loadGameTypes((CompoundTag) optional.orElse(null)); // CraftBukkit - decompile error
          ServerGamePacketListenerImpl playerconnection = new ServerGamePacketListenerImpl(this.server, connection, player, clientData);
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index c809a4692fcabf87c16fcd932ef25a718c2935d3..a237a4ea3b60ba3b5a2cfa12748ac682240a8a4e 100644
+index b18dfe9223b75d8a36b4b3a934625914f9a6a553..19b198fb1d0ffee28a2cfd516cb31204fd1a310c 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 @@ -29,6 +29,15 @@ public class GlobalConfiguration extends ConfigurationPart {

diff --git a/...e-missing-Pufferfish-configurations.patch → ...e-missing-Pufferfish-configurations.patch b/...e-missing-Pufferfish-configurations.patch → ...e-missing-Pufferfish-configurations.patch
diff --git a/...040-Improve-biome-temperature-cache.patch → ...041-Improve-biome-temperature-cache.patch b/...040-Improve-biome-temperature-cache.patch → ...041-Improve-biome-temperature-cache.patch