diff --git a/patches/server/0056-Make-sand-duping-fix-configurable.patch b/patches/server/0056-Make-sand-duping-fix-configurable.patch index 97a2462..e577031 100644 --- a/patches/server/0056-Make-sand-duping-fix-configurable.patch +++ b/patches/server/0056-Make-sand-duping-fix-configurable.patch @@ -34,7 +34,7 @@ index b2d1a17867cdbaad0c6e5c2376c716f9461af124..9d8a8dd2e6ec76beb6552266da7ae7c1 } // Paper end - fix sand duping diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 9ac9873c4ffcbc88daf5ca3947cd60177cb0fe5d..d9488447aa439e9909e66a4c26adc542fe424ed3 100644 +index 9ac9873c4ffcbc88daf5ca3947cd60177cb0fe5d..5b1a20efac4835eb10f8f068166f501ddc19ae0c 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -241,4 +241,14 @@ public class GaleWorldConfiguration extends ConfigurationPart { @@ -46,7 +46,7 @@ index 9ac9873c4ffcbc88daf5ca3947cd60177cb0fe5d..d9488447aa439e9909e66a4c26adc542 + + public Fixes fixes; + public class Fixes extends ConfigurationPart { -+ public boolean sandDuping = true; ++ public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable + } + + } diff --git a/patches/server/0057-Fix-MC-238526.patch b/patches/server/0057-Fix-MC-238526.patch new file mode 100644 index 0000000..718a97c --- /dev/null +++ b/patches/server/0057-Fix-MC-238526.patch @@ -0,0 +1,37 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MartijnMuijsers +Date: Tue, 29 Nov 2022 16:16:35 +0100 +Subject: [PATCH] Fix MC-238526 + +License: MIT (https://opensource.org/licenses/MIT) + +This patch is based on the following patch: +"MC-238526 - Fix spawner not spawning water animals correctly" +By: BillyGalbreath +As part of: Purpur (https://github.com/PurpurMC/Purpur) +Licensed under: MIT (https://opensource.org/licenses/MIT) + +diff --git a/src/main/java/net/minecraft/world/entity/animal/WaterAnimal.java b/src/main/java/net/minecraft/world/entity/animal/WaterAnimal.java +index 18389f46902bb9879ac6d734723e9a720724dc48..613970368890d78ab589f654a66024eeef23983a 100644 +--- a/src/main/java/net/minecraft/world/entity/animal/WaterAnimal.java ++++ b/src/main/java/net/minecraft/world/entity/animal/WaterAnimal.java +@@ -83,6 +83,6 @@ public abstract class WaterAnimal extends PathfinderMob { + i = world.getMinecraftWorld().paperConfig().entities.spawning.wateranimalSpawnHeight.maximum.or(i); + j = world.getMinecraftWorld().paperConfig().entities.spawning.wateranimalSpawnHeight.minimum.or(j); + // Paper end +- return pos.getY() >= j && pos.getY() <= i && world.getFluidState(pos.below()).is(FluidTags.WATER) && world.getBlockState(pos.above()).is(Blocks.WATER); ++ return ((reason == MobSpawnType.SPAWNER && world.getMinecraftWorld().galeConfig().gameplayMechanics.fixes.mc238526) || (pos.getY() >= j && pos.getY() <= i)) && world.getFluidState(pos.below()).is(FluidTags.WATER) && world.getBlockState(pos.above()).is(Blocks.WATER); // Gale - Purpur - fix MC-238526 + } + } +diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +index 5b1a20efac4835eb10f8f068166f501ddc19ae0c..db8d97a14d1334c231732cc03c1f85a107b52a34 100644 +--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java ++++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +@@ -247,6 +247,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { + public Fixes fixes; + public class Fixes extends ConfigurationPart { + public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable ++ public boolean mc238526 = false; // Gale - Purpur - fix MC-238526 + } + + } diff --git a/patches/server/0057-Reduce-array-allocations.patch b/patches/server/0058-Reduce-array-allocations.patch similarity index 100% rename from patches/server/0057-Reduce-array-allocations.patch rename to patches/server/0058-Reduce-array-allocations.patch diff --git a/patches/server/0058-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/patches/server/0059-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch similarity index 100% rename from patches/server/0058-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch rename to patches/server/0059-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch diff --git a/patches/server/0059-Measure-last-tick-time.patch b/patches/server/0060-Measure-last-tick-time.patch similarity index 100% rename from patches/server/0059-Measure-last-tick-time.patch rename to patches/server/0060-Measure-last-tick-time.patch diff --git a/patches/server/0060-Last-tick-time-API.patch b/patches/server/0061-Last-tick-time-API.patch similarity index 100% rename from patches/server/0060-Last-tick-time-API.patch rename to patches/server/0061-Last-tick-time-API.patch diff --git a/patches/server/0061-Show-last-tick-time-in-tps-command.patch b/patches/server/0062-Show-last-tick-time-in-tps-command.patch similarity index 100% rename from patches/server/0061-Show-last-tick-time-in-tps-command.patch rename to patches/server/0062-Show-last-tick-time-in-tps-command.patch diff --git a/patches/server/0062-Collision-physics-check-before-vehicle-check.patch b/patches/server/0063-Collision-physics-check-before-vehicle-check.patch similarity index 100% rename from patches/server/0062-Collision-physics-check-before-vehicle-check.patch rename to patches/server/0063-Collision-physics-check-before-vehicle-check.patch diff --git a/patches/server/0063-Variable-main-thread-task-delay.patch b/patches/server/0064-Variable-main-thread-task-delay.patch similarity index 100% rename from patches/server/0063-Variable-main-thread-task-delay.patch rename to patches/server/0064-Variable-main-thread-task-delay.patch diff --git a/patches/server/0064-Reduce-RandomSource-instances.patch b/patches/server/0065-Reduce-RandomSource-instances.patch similarity index 100% rename from patches/server/0064-Reduce-RandomSource-instances.patch rename to patches/server/0065-Reduce-RandomSource-instances.patch diff --git a/patches/server/0065-CPU-cores-estimation.patch b/patches/server/0066-CPU-cores-estimation.patch similarity index 100% rename from patches/server/0065-CPU-cores-estimation.patch rename to patches/server/0066-CPU-cores-estimation.patch diff --git a/patches/server/0066-Add-centralized-AsyncExecutor.patch b/patches/server/0067-Add-centralized-AsyncExecutor.patch similarity index 100% rename from patches/server/0066-Add-centralized-AsyncExecutor.patch rename to patches/server/0067-Add-centralized-AsyncExecutor.patch diff --git a/patches/server/0067-Remove-Paper-async-executor.patch b/patches/server/0068-Remove-Paper-async-executor.patch similarity index 100% rename from patches/server/0067-Remove-Paper-async-executor.patch rename to patches/server/0068-Remove-Paper-async-executor.patch diff --git a/patches/server/0068-Remove-Paper-cleaner-executor.patch b/patches/server/0069-Remove-Paper-cleaner-executor.patch similarity index 100% rename from patches/server/0068-Remove-Paper-cleaner-executor.patch rename to patches/server/0069-Remove-Paper-cleaner-executor.patch diff --git a/patches/server/0069-Remove-background-executor.patch b/patches/server/0070-Remove-background-executor.patch similarity index 100% rename from patches/server/0069-Remove-background-executor.patch rename to patches/server/0070-Remove-background-executor.patch diff --git a/patches/server/0070-Remove-bootstrap-executor.patch b/patches/server/0071-Remove-bootstrap-executor.patch similarity index 100% rename from patches/server/0070-Remove-bootstrap-executor.patch rename to patches/server/0071-Remove-bootstrap-executor.patch diff --git a/patches/server/0071-Remove-world-upgrade-executors.patch b/patches/server/0072-Remove-world-upgrade-executors.patch similarity index 100% rename from patches/server/0071-Remove-world-upgrade-executors.patch rename to patches/server/0072-Remove-world-upgrade-executors.patch diff --git a/patches/server/0072-Remove-tab-complete-executor.patch b/patches/server/0073-Remove-tab-complete-executor.patch similarity index 100% rename from patches/server/0072-Remove-tab-complete-executor.patch rename to patches/server/0073-Remove-tab-complete-executor.patch diff --git a/patches/server/0073-Remove-text-filter-executor.patch b/patches/server/0074-Remove-text-filter-executor.patch similarity index 100% rename from patches/server/0073-Remove-text-filter-executor.patch rename to patches/server/0074-Remove-text-filter-executor.patch