[ci-skip] fix patches (not all)

2025-12-19 14:59:25 +00:00 · 2024-04-16 01:19:40 +03:00
parent 1ff7ee53e8
commit a00a536905
42 changed files with 109 additions and 97 deletions
--- a/patches/api/0001-Divine-Configuration.patch
+++ b/patches/api/0001-Divine-Configuration.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Divine Configuration


 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 90f109af3c83a1bc12cb27497d107de5029d0ce6..4f486ab08028402fd0df64989d59f7ee30e801c4 100644
+index c15b0b05870a469ea5d314c9fac6a57a045f463c..95795f7d8ea1834e255857945a8172998d93ff34 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2241,6 +2241,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2247,6 +2247,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
         }
         // Purpur end
 
--- a/patches/api/0004-Add-Higher-Java-Version-for-Pufferfish.patch
+++ b/patches/api/0004-Add-Higher-Java-Version-for-Pufferfish.patch
@@ -5,14 +5,14 @@ Subject: [PATCH] Add Higher Java Version for Pufferfish


 diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
-index ab5fea0b03224bf249352ce340e94704ff713345..f0c33c55bcbbd93c658179b1b573354fc9480b79 100644
+index 3441cdad70da1bd523c5933b1a914688718c2657..f0c33c55bcbbd93c658179b1b573354fc9480b79 100644
 --- a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
 +++ b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
@@ -15,7 +15,7 @@ public class SIMDChecker {
 	@Deprecated
 	public static boolean canEnable(Logger logger) {
 		try {
-			if (SIMDDetection.getJavaVersion() != 17 && SIMDDetection.getJavaVersion() != 18 && SIMDDetection.getJavaVersion() != 19) {
+-			if (SIMDDetection.getJavaVersion() < 17 || SIMDDetection.getJavaVersion() > 21) {
 +			if (SIMDDetection.getJavaVersion() < 17) { // DivineMC - Add Higher Java Version for Pufferfish
 				return false;
 			} else {
--- a/patches/removed/1.20/server/0009-EMC-Allow-negative-Amplifier-values.patch
+++ b/patches/removed/1.20/server/0009-EMC-Allow-negative-Amplifier-values.patch
--- a/patches/server/0004-Optimize-default-values-for-configs.patch
+++ b/patches/server/0004-Optimize-default-values-for-configs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize default values for configs


 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index f2e30d8743a97c0541808dc5c03300c0d881b843..3fca7bc8f6eb3754d97dc4138606ece331f112e1 100644
+index 30fe1c0645a07d663b08c0f988a1ab3a750bf7c4..f8ceb440d402044f3b5e7925981029c893d8c17f 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
@@ -96,9 +96,11 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -23,7 +23,7 @@ index f2e30d8743a97c0541808dc5c03300c0d881b843..3fca7bc8f6eb3754d97dc4138606ece3
         public boolean serverNamePrivacy = false;
         public List<String> hiddenConfigEntries = List.of(
             "database",
-@@ -328,9 +330,9 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -330,9 +332,9 @@ public class GlobalConfiguration extends ConfigurationPart {
         public boolean fixEntityPositionDesync = true;
         public boolean loadPermissionsYmlBeforePlugins = true;
         @Constraints.Min(4)
--- a/patches/server/0005-Add-missing-purpur-config-options.patch
+++ b/patches/server/0005-Add-missing-purpur-config-options.patch
@@ -56,10 +56,10 @@ index 8616a8c09a21f576a07daaa93ebf64e0f03d0c88..6725e22ef763b3cd374ff38f5f36ad6e
     public void addAdditionalSaveData(CompoundTag nbt) {
         super.addAdditionalSaveData(nbt);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
-index d6340d0a1308bafd3ba176562bf08dcadec02b34..bc991589effff1a0c9bd48a16c7d460bed3dfd95 100644
+index 37f1d3c656997906cef57d9dbefc226d04fc65fe..8935f17cb02ab8d38e6269608e97e0cb18b0b051 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
-@@ -142,6 +142,23 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
+@@ -167,6 +167,23 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
         return this.level().purpurConfig.frogBreedingTicks;
     }
 
@@ -215,7 +215,7 @@ index fe4c1659f0ca111db8a6d2d6b06d1783872705d6..80a5df11f57fb39a71461b774f0f5bcf
         org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
         enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 002c9bba93dede25111c653ec1df38316f19421f..2d829f61b66cc3b2ff9e90cac038c67b8620a9c3 100644
+index 7dc82ffccc157a17335f1bc56ab81be3813294f6..41576be4fa6c3302274a4c8f48e84c87fb01c170 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1170,7 +1170,17 @@ public class PurpurWorldConfig {
@@ -304,7 +304,7 @@ index 002c9bba93dede25111c653ec1df38316f19421f..2d829f61b66cc3b2ff9e90cac038c67b
         tadpoleRidable = getBoolean("mobs.tadpole.ridable", tadpoleRidable);
         tadpoleRidableInWater = getBoolean("mobs.tadpole.ridable-in-water", tadpoleRidableInWater);
         tadpoleControllable = getBoolean("mobs.tadpole.controllable", tadpoleControllable);
-@@ -2979,7 +3025,17 @@ public class PurpurWorldConfig {
+@@ -2983,7 +3029,17 @@ public class PurpurWorldConfig {
     public boolean wardenRidable = false;
     public boolean wardenRidableInWater = true;
     public boolean wardenControllable = true;
--- a/patches/server/0007-Fix-entity-serialization.patch
+++ b/patches/server/0007-Fix-entity-serialization.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix entity serialization


 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 2092ede561d14ace1c003ced051cd4967bb41beb..1d0804ba5ecbd1b63a7b4c92e04570938bcb93c4 100644
+index f2c6b52fe7fbb05afa0074684cd195f6ae598f1f..8f948df85246ecbbca2c3c2b99e24f847b7386c6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2356,15 +2356,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -25,10 +25,10 @@ index 2092ede561d14ace1c003ced051cd4967bb41beb..1d0804ba5ecbd1b63a7b4c92e0457093
         return this.isPassenger() ? false : this.saveAsPassenger(nbt);
     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index d5f642e4b1c1ede7e9d2dea072aa5f22c73b5c23..11110398ebd42e4049e36a90d5677bdd8a7d550c 100644
+index e29dc1101c7aa4b7b2a2d2e732e27a1a14a2a234..bdbf2724204cb36de171900c2a8f92097da5102d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -523,8 +523,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -528,8 +528,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
         Preconditions.checkNotNull(entity, "null cannot be serialized");
         Preconditions.checkArgument(entity instanceof org.bukkit.craftbukkit.entity.CraftEntity, "only CraftEntities can be serialized");
 
--- a/patches/server/0009-Remove-Spigot-tick-limiter.patch
+++ b/patches/server/0009-Remove-Spigot-tick-limiter.patch
@@ -7,7 +7,7 @@ Original code by Titaniumtown, modified by NONPLAYT
 You can find the original code on https://gitlab.com/Titaniumtown/JettPack

 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 7dc96d5fd30dc17af23157dedab4edb7caa7551e..36bb40fc98d651f2d63fb7a59b70272d60479f59 100644
+index 7683f6a99dfac07ae6ab0d9fd42598b4f57907e8..702729d610d090af934f7b95c9e0877d9441df42 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -171,8 +171,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
--- a/patches/server/0010-Boat-Settings.patch
+++ b/patches/server/0010-Boat-Settings.patch
--- a/patches/server/0011-Fix-MC-110386.patch
+++ b/patches/server/0011-Fix-MC-110386.patch
--- a/patches/server/0012-Despawn-shulker-bullets-on-owner-death.patch
+++ b/patches/server/0012-Despawn-shulker-bullets-on-owner-death.patch
--- a/patches/server/0013-Fix-MC-31819.patch
+++ b/patches/server/0013-Fix-MC-31819.patch
--- a/patches/server/0014-Reduce-sensor-work.patch
+++ b/patches/server/0014-Reduce-sensor-work.patch
@@ -7,7 +7,7 @@ Original project: Bloom-host/Petal
 Link: https://github.com/Bloom-host/Petal

 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index bfa69b2c37f07132f8b31c12d26f4ceb074901a5..9a391877770ecc69f040bb1b3aae51129a479f37 100644
+index d6705dce3bc8c1964184fe425386b3f3c0a8202e..56811b7068450a56818dcc03d1777d082df88d52 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1046,20 +1046,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
--- a/patches/server/0015-Fix-MC-172801.patch
+++ b/patches/server/0015-Fix-MC-172801.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix MC-172801
 Original post on Mojira: https://bugs.mojang.com/browse/MC-172801

 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 9a391877770ecc69f040bb1b3aae51129a479f37..920af22a228a4debcd0384c843c7e964cc958405 100644
+index 56811b7068450a56818dcc03d1777d082df88d52..b48736a9f60c92d904e31f1faaacb6caf47d4070 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3094,7 +3094,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
--- a/patches/server/0016-Fix-MC-2025.patch
+++ b/patches/server/0016-Fix-MC-2025.patch
@@ -7,7 +7,7 @@ Original post on Mojira: https://bugs.mojang.com/browse/MC-2025
 Fix taken from Reddit: https://redd.it/8pgd4q

 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1d0804ba5ecbd1b63a7b4c92e04570938bcb93c4..d72d703308de39ff769e4311e2349f5fb13e7912 100644
+index 8f948df85246ecbbca2c3c2b99e24f847b7386c6..2702de4408df4c74fef1951add2e38d92abc144c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2522,6 +2522,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
--- a/patches/server/0017-Optimize-Paper-Event-Manager.patch
+++ b/patches/server/0017-Optimize-Paper-Event-Manager.patch
--- a/patches/server/0018-Fix-MC-65198.patch
+++ b/patches/server/0018-Fix-MC-65198.patch
@@ -27,7 +27,7 @@ index 3756de835ea87e3a4fb87cbf77365ffd87957ea9..e5f40f0a8702c98914384e9ffd204da8
         }
 
 diff --git a/src/main/java/net/minecraft/world/inventory/ResultSlot.java b/src/main/java/net/minecraft/world/inventory/ResultSlot.java
-index 245731757f2593c736916ac6ee59e2c91d179934..537991e3b46d65f4313c42997d7f199a2796241b 100644
+index accf752e7615f775483830f81bd0df30e40d3c7f..54f83aaa7aaca680965b7e53fd2d1660896af53e 100644
 --- a/src/main/java/net/minecraft/world/inventory/ResultSlot.java
 +++ b/src/main/java/net/minecraft/world/inventory/ResultSlot.java
@@ -45,7 +45,7 @@ public class ResultSlot extends Slot {
@@ -38,7 +38,7 @@ index 245731757f2593c736916ac6ee59e2c91d179934..537991e3b46d65f4313c42997d7f199a
 +            stack.onCraftedBy(this.player.level(), this.player, stack.getCount()); // DivineMC - Fix MC-65198
         }
 
-         Container var3 = this.container;
+         if (this.container instanceof RecipeCraftingHolder recipeCraftingHolder) {
 diff --git a/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java b/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
 index eade15820dd9db38b6af2a5c4314acfb14ca03e9..3cb6a347b3269cb8b451798c7d1606227ebca007 100644
 --- a/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
--- a/patches/server/0019-Make-entity-goals-public.patch
+++ b/patches/server/0019-Make-entity-goals-public.patch
@@ -125,18 +125,18 @@ index d5becd13774f9a2ead77d58e777ffc9aea10cb60..7c9ed0f28116d4aad6bbabd5d710cd4b
         this.goalSelector.addGoal(8, new RandomStrollGoal(this, 0.6D));
         this.goalSelector.addGoal(9, new LookAtPlayerGoal(this, Player.class, 15.0F, 1.0F));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-index ee9d5933f74584452a1b27a392e7d36dac5b9bc9..bda187a54fab35059565219a6aa7c32406dcfe9a 100644
+index 960b5e2c290f82501384f79d4653f47bedf926fb..1f382f864209a4c8f654d019b0a5907734d44d0d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-@@ -97,7 +97,7 @@ public class Vindicator extends AbstractIllager {
+@@ -95,7 +95,7 @@ public class Vindicator extends AbstractIllager {
         this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
         this.goalSelector.addGoal(1, new Vindicator.VindicatorBreakDoorGoal(this));
         this.goalSelector.addGoal(2, new AbstractIllager.RaiderOpenDoorGoal(this));
 -        this.goalSelector.addGoal(3, new Raider.HoldGroundAttackGoal(this, 10.0F));
 +        this.goalSelector.addGoal(3, new HoldGroundAttackGoal(this, 10.0F));
-         this.goalSelector.addGoal(4, new MeleeAttackGoal(this, 1.0D, false));
+         this.goalSelector.addGoal(4, new MeleeAttackGoal(this, 1.0, false));
         this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
-         this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, Raider.class)).setAlertOthers());
+         this.targetSelector.addGoal(1, new HurtByTargetGoal(this, Raider.class).setAlertOthers());
 diff --git a/src/main/java/net/minecraft/world/entity/raid/Raider.java b/src/main/java/net/minecraft/world/entity/raid/Raider.java
 index b3912881892b4f1bca577761083c5da1568c8187..5e8c9177644896d8f9243c3e7ce903fcdc6e9fa2 100644
 --- a/src/main/java/net/minecraft/world/entity/raid/Raider.java
--- a/patches/server/0020-Fix-MC-7569.patch
+++ b/patches/server/0020-Fix-MC-7569.patch
--- a/patches/server/0021-Fix-MC-93018.patch
+++ b/patches/server/0021-Fix-MC-93018.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix MC-93018
 Original post on Mojira: https://bugs.mojang.com/browse/MC-93018

 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-index 5d49ed7ddf44a3d549b178ae548664194967776b..8ff325a6f8e70be3df989296044d00931814a10a 100644
+index a90055fe8819a32180754b6060a0f88e81d1a3b6..cf52c73dfc4d078959d618af5d0efca3801b1d99 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
@@ -655,14 +655,17 @@ public class Wolf extends TamableAnimal implements NeutralMob {
--- a/patches/server/0022-Do-not-process-chat-commands-before-player-has-joine.patch
+++ b/patches/server/0022-Do-not-process-chat-commands-before-player-has-joine.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Do not process chat/commands before player has joined


 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b7803d6753d28f174b8a6e5b31eccfa44b94c6be..45ff1a20630e4d72036cb0c900c06a785b1c3f24 100644
+index 9ba9356260d54ec318f07a8af221e9567ee03b12..28c46673995549a879e222d52abb9a7d2c24d6ed 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -6,6 +6,7 @@ import com.mojang.authlib.GameProfile;
--- a/patches/server/0023-Configurable-Chat-message-signatures.patch
+++ b/patches/server/0023-Configurable-Chat-message-signatures.patch
@@ -18,10 +18,10 @@ index e4fd372a1d585887287253a02531cd192929377b..b7eb830ae6ae0d7d8c79dc4ccde9ac73
     }
 
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ServerboundChatCommandPacket.java b/src/main/java/net/minecraft/network/protocol/game/ServerboundChatCommandPacket.java
-index b8c1f3b9afddc87d56541c8af63cffecfcdd2653..37c6a8aee54b8ad093e80e735a0dd481f7697676 100644
+index e62ae57532ddcf12b7ebca77220cb1f3bd603717..70201f97584442b7573a3da7b9a439117aa442ca 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ServerboundChatCommandPacket.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ServerboundChatCommandPacket.java
-@@ -16,7 +16,7 @@ public record ServerboundChatCommandPacket(String command, Instant timeStamp, lo
+@@ -18,7 +18,7 @@ public record ServerboundChatCommandPacket(
         buf.writeUtf(this.command, 256);
         buf.writeInstant(this.timeStamp);
         buf.writeLong(this.salt);
@@ -31,10 +31,10 @@ index b8c1f3b9afddc87d56541c8af63cffecfcdd2653..37c6a8aee54b8ad093e80e735a0dd481
     }
 
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ServerboundChatPacket.java b/src/main/java/net/minecraft/network/protocol/game/ServerboundChatPacket.java
-index d1d2fc0c57523c1abf1e8bfec913c78927c3dafc..c1be2300e10a58f9db7ad9197c4aa7eaa6d7e45b 100644
+index 831178218ddfaa1828c00d0662b251d11bb29ff5..10a4a52b13de38791c58f2323dffd320a789b547 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ServerboundChatPacket.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ServerboundChatPacket.java
-@@ -17,7 +17,7 @@ public record ServerboundChatPacket(String message, Instant timeStamp, long salt
+@@ -18,7 +18,7 @@ public record ServerboundChatPacket(String message, Instant timeStamp, long salt
         buf.writeUtf(this.message, 256);
         buf.writeInstant(this.timeStamp);
         buf.writeLong(this.salt);
@@ -44,16 +44,37 @@ index d1d2fc0c57523c1abf1e8bfec913c78927c3dafc..c1be2300e10a58f9db7ad9197c4aa7ea
     }
 
 diff --git a/src/main/java/net/minecraft/network/protocol/status/ServerStatus.java b/src/main/java/net/minecraft/network/protocol/status/ServerStatus.java
-index c40979e2fa37acb2f3df493395f3ab6e185345d7..826e4a8618db5328ad2df21fd08e5b1cb02cd465 100644
+index 5ed4a3a30657ab9e748245ad34333b915e870ae2..7b76782d7fc7bebef4248b1847ba6dd8a6c5dc8c 100644
 --- a/src/main/java/net/minecraft/network/protocol/status/ServerStatus.java
 +++ b/src/main/java/net/minecraft/network/protocol/status/ServerStatus.java
-@@ -17,7 +17,7 @@ import net.minecraft.network.chat.ComponentSerialization;
- 
- public record ServerStatus(Component description, Optional<ServerStatus.Players> players, Optional<ServerStatus.Version> version, Optional<ServerStatus.Favicon> favicon, boolean enforcesSecureChat) {
-     public static final Codec<ServerStatus> CODEC = RecordCodecBuilder.create((instance) -> {
-        return instance.group(ComponentSerialization.CODEC.optionalFieldOf("description", CommonComponents.EMPTY).forGetter(ServerStatus::description), ServerStatus.Players.CODEC.optionalFieldOf("players").forGetter(ServerStatus::players), ServerStatus.Version.CODEC.optionalFieldOf("version").forGetter(ServerStatus::version), ServerStatus.Favicon.CODEC.optionalFieldOf("favicon").forGetter(ServerStatus::favicon), Codec.BOOL.optionalFieldOf("enforcesSecureChat", Boolean.valueOf(false)).forGetter(ServerStatus::enforcesSecureChat)).apply(instance, ServerStatus::new);
-+        return space.bxteam.divinemc.configuration.DivineConfig.chatMessageSignatures ? instance.group(ComponentSerialization.CODEC.optionalFieldOf("description", CommonComponents.EMPTY).forGetter(ServerStatus::description), ServerStatus.Players.CODEC.optionalFieldOf("players").forGetter(ServerStatus::players), ServerStatus.Version.CODEC.optionalFieldOf("version").forGetter(ServerStatus::version), ServerStatus.Favicon.CODEC.optionalFieldOf("favicon").forGetter(ServerStatus::favicon), Codec.BOOL.optionalFieldOf("enforcesSecureChat", Boolean.FALSE).forGetter(x -> true)).apply(instance, ServerStatus::new) : instance.group(ComponentSerialization.CODEC.optionalFieldOf("description", CommonComponents.EMPTY).forGetter(ServerStatus::description), ServerStatus.Players.CODEC.optionalFieldOf("players").forGetter(ServerStatus::players), ServerStatus.Version.CODEC.optionalFieldOf("version").forGetter(ServerStatus::version), ServerStatus.Favicon.CODEC.optionalFieldOf("favicon").forGetter(ServerStatus::favicon), Codec.BOOL.optionalFieldOf("enforcesSecureChat", Boolean.FALSE).forGetter(ServerStatus::enforcesSecureChat)).apply(instance, ServerStatus::new); // DivineMC - Configurable Chat message signatures
-     });
+@@ -23,14 +23,21 @@ public record ServerStatus(
+     boolean enforcesSecureChat
+ ) {
+     public static final Codec<ServerStatus> CODEC = RecordCodecBuilder.create(
+-        instance -> instance.group(
+-                    ComponentSerialization.CODEC.optionalFieldOf("description", CommonComponents.EMPTY).forGetter(ServerStatus::description),
+-                    ServerStatus.Players.CODEC.optionalFieldOf("players").forGetter(ServerStatus::players),
+-                    ServerStatus.Version.CODEC.optionalFieldOf("version").forGetter(ServerStatus::version),
+-                    ServerStatus.Favicon.CODEC.optionalFieldOf("favicon").forGetter(ServerStatus::favicon),
+-                    Codec.BOOL.optionalFieldOf("enforcesSecureChat", Boolean.valueOf(false)).forGetter(ServerStatus::enforcesSecureChat)
+-                )
+-                .apply(instance, ServerStatus::new)
+            instance -> space.bxteam.divinemc.configuration.DivineConfig.chatMessageSignatures ? instance.group(
+                            ComponentSerialization.CODEC.optionalFieldOf("description", CommonComponents.EMPTY).forGetter(ServerStatus::description),
+                            ServerStatus.Players.CODEC.optionalFieldOf("players").forGetter(ServerStatus::players),
+                            ServerStatus.Version.CODEC.optionalFieldOf("version").forGetter(ServerStatus::version),
+                            ServerStatus.Favicon.CODEC.optionalFieldOf("favicon").forGetter(ServerStatus::favicon),
+                            Codec.BOOL.optionalFieldOf("enforcesSecureChat", Boolean.FALSE).forGetter(x -> true)
+                    )
+                    .apply(instance, ServerStatus::new) : instance.group(
+                            ComponentSerialization.CODEC.optionalFieldOf("description", CommonComponents.EMPTY).forGetter(ServerStatus::description),
+                            ServerStatus.Players.CODEC.optionalFieldOf("players").forGetter(ServerStatus::players),
+                            ServerStatus.Version.CODEC.optionalFieldOf("version").forGetter(ServerStatus::version),
+                            ServerStatus.Favicon.CODEC.optionalFieldOf("favicon").forGetter(ServerStatus::favicon),
+                            Codec.BOOL.optionalFieldOf("enforcesSecureChat", Boolean.FALSE).forGetter(ServerStatus::enforcesSecureChat)
+                    )
+                    .apply(instance, ServerStatus::new)
+     );
 
     public static record Favicon(byte[] iconBytes) {
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -69,7 +90,7 @@ index 41cffa00d4978f46b47ac6ede2da2a256796a0ba..9fa9a1e1efab58f3133b32517bb04c2e
 
         // Paper start - Add setting for proxy online mode status
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 36b7686fdfeaab13cb1be9610ddc76fc70f6f6e5..0b25278d87eed5fd334693c3cb3a93d1fe2f8164 100644
+index 305b90d10a499e9731f5178433fb10207e428091..8206429795ec7bf81b9e628ac08ffc591ddd409a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2258,7 +2258,7 @@ public class ServerPlayer extends Player {
@@ -164,12 +185,12 @@ index ac1e0c66f167218306504db6037cc1d6509072a0..7784a81f2b861e1f5c9dd7a7885e8be7
     }
 
 diff --git a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java
-index d5ac67927dd2091733eaa096c903874fa4cd9542..4ea8eb876186848f16050b34acc2ab494ea7dcd3 100644
+index ef7983863da3b4febef3da2fab93fe581fbd65af..b9223f4778de0c2ed6efed6f8c192cb0212cbda8 100644
 --- a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java
 +++ b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java
-@@ -168,4 +168,9 @@ public class DivineConfig {
-         else
-             linearFlushThreads = Math.max(linearFlushThreads, 1);
+@@ -157,4 +157,9 @@ public class DivineConfig {
+     private static void  doNotProcessChatCommands() {
+         doNotProcessChatCommands = getBoolean("settings.do-not-process-chat-commands", doNotProcessChatCommands);
     }
 +
 +    public static boolean chatMessageSignatures = false;
--- a/patches/server/0024-Optimize-CraftServer.getWorld-UUID.patch
+++ b/patches/server/0024-Optimize-CraftServer.getWorld-UUID.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize CraftServer.getWorld(UUID)
 Original code by MultiPaper - https://github.com/MultiPaper/MultiPaper

 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 37d8ce3bb1678780b99dd2c3a02b608c782687e2..e2e80af743a05f232361630ed9cd28cd797589d5 100644
+index 1e3c4131e9dd155e4a0830d4c3f76f7f93146fff..a59a786049bfe1ca341a6f8833163a01d51535c5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -265,6 +265,8 @@ import net.md_5.bungee.api.chat.BaseComponent; // Spigot
--- a/patches/server/0025-Carpet-Fixes-RecipeManager-Optimize.patch
+++ b/patches/server/0025-Carpet-Fixes-RecipeManager-Optimize.patch
@@ -37,10 +37,10 @@ index d87124f5356180a37e581febc6141fdc5f1395a7..4ae4d1203df960c109c1b70d6d710eaa
 
     public <C extends Container, T extends Recipe<C>> List<RecipeHolder<T>> getRecipesFor(RecipeType<T> type, C inventory, Level world) {
 diff --git a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java
-index 4ea8eb876186848f16050b34acc2ab494ea7dcd3..b706c7cee4fe61774a0485ef52a160d29199e0aa 100644
+index b9223f4778de0c2ed6efed6f8c192cb0212cbda8..6cf0675cf5affb989e75d6a1cbab69f0a3ce1e34 100644
 --- a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java
 +++ b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java
-@@ -173,4 +173,9 @@ public class DivineConfig {
+@@ -162,4 +162,9 @@ public class DivineConfig {
     private static void chatMessageSignatures() {
         chatMessageSignatures = getBoolean("settings.disable-chat-reports", chatMessageSignatures);
     }
--- a/patches/server/0026-Carpet-Fixes-getBiome-Optimize.patch
+++ b/patches/server/0026-Carpet-Fixes-getBiome-Optimize.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Carpet-Fixes: getBiome Optimize


 diff --git a/src/main/java/net/minecraft/world/level/biome/BiomeManager.java b/src/main/java/net/minecraft/world/level/biome/BiomeManager.java
-index 5695c5116c8a338b2e41aafcb2dc9f2146856970..b7f704cb1db4c1f588c3984d03c1289960675615 100644
+index 48ee643643e1548fa9c23484bf2f88f4ee3f380d..77ba51d9a220fb8faecb733cbd885bb2343c4343 100644
 --- a/src/main/java/net/minecraft/world/level/biome/BiomeManager.java
 +++ b/src/main/java/net/minecraft/world/level/biome/BiomeManager.java
@@ -14,6 +14,7 @@ public class BiomeManager {
@@ -26,22 +26,22 @@ index 5695c5116c8a338b2e41aafcb2dc9f2146856970..b7f704cb1db4c1f588c3984d03c12899
 -        int l = i >> 2;
 -        int m = j >> 2;
 -        int n = k >> 2;
-        double d = (double)(i & 3) / 4.0D;
-        double e = (double)(j & 3) / 4.0D;
-        double f = (double)(k & 3) / 4.0D;
+-        double d = (i & 3) / 4.0;
+-        double e = (j & 3) / 4.0;
+-        double f = (k & 3) / 4.0;
 -        int o = 0;
 -        double g = Double.POSITIVE_INFINITY;
 -
-        for(int p = 0; p < 8; ++p) {
+-        for (int p = 0; p < 8; p++) {
 -            boolean bl = (p & 4) == 0;
 -            boolean bl2 = (p & 2) == 0;
 -            boolean bl3 = (p & 1) == 0;
 -            int q = bl ? l : l + 1;
 -            int r = bl2 ? m : m + 1;
 -            int s = bl3 ? n : n + 1;
-            double h = bl ? d : d - 1.0D;
-            double t = bl2 ? e : e - 1.0D;
-            double u = bl3 ? f : f - 1.0D;
+-            double h = bl ? d : d - 1.0;
+-            double t = bl2 ? e : e - 1.0;
+-            double u = bl3 ? f : f - 1.0;
 -            double v = getFiddledDistance(this.biomeZoomSeed, q, r, s, h, t, u);
 -            if (g > v) {
 -                o = p;
@@ -114,22 +114,22 @@ index 5695c5116c8a338b2e41aafcb2dc9f2146856970..b7f704cb1db4c1f588c3984d03c12899
 +            int l = i >> 2;
 +            int m = j >> 2;
 +            int n = k >> 2;
-+            double d = (double)(i & 3) / 4.0D;
-+            double e = (double)(j & 3) / 4.0D;
-+            double f = (double)(k & 3) / 4.0D;
+            double d = (i & 3) / 4.0;
+            double e = (j & 3) / 4.0;
+            double f = (k & 3) / 4.0;
 +            int o = 0;
 +            double g = Double.POSITIVE_INFINITY;
 +
-+            for(int p = 0; p < 8; ++p) {
+            for (int p = 0; p < 8; p++) {
 +                boolean bl = (p & 4) == 0;
 +                boolean bl2 = (p & 2) == 0;
 +                boolean bl3 = (p & 1) == 0;
 +                int q = bl ? l : l + 1;
 +                int r = bl2 ? m : m + 1;
 +                int s = bl3 ? n : n + 1;
-+                double h = bl ? d : d - 1.0D;
-+                double t = bl2 ? e : e - 1.0D;
-+                double u = bl3 ? f : f - 1.0D;
+                double h = bl ? d : d - 1.0;
+                double t = bl2 ? e : e - 1.0;
+                double u = bl3 ? f : f - 1.0;
 +                double v = getFiddledDistance(this.biomeZoomSeed, q, r, s, h, t, u);
 +                if (g > v) {
 +                    o = p;
@@ -152,10 +152,10 @@ index 5695c5116c8a338b2e41aafcb2dc9f2146856970..b7f704cb1db4c1f588c3984d03c12899
 
     public Holder<Biome> getNoiseBiomeAtPosition(double x, double y, double z) {
 diff --git a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java
-index b706c7cee4fe61774a0485ef52a160d29199e0aa..1bbaa8b1ca217b37d550e40b3742ac867289d05a 100644
+index 6cf0675cf5affb989e75d6a1cbab69f0a3ce1e34..50db7431ec4a05a73ba3a5fb04b4c68427628982 100644
 --- a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java
 +++ b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java
-@@ -175,7 +175,9 @@ public class DivineConfig {
+@@ -164,7 +164,9 @@ public class DivineConfig {
     }
 
     public static boolean recipeManagerOptimization = true;
--- a/patches/server/0027-lithium-ai.raid.patch
+++ b/patches/server/0027-lithium-ai.raid.patch
--- a/patches/server/0028-lithium-collections.goals.patch
+++ b/patches/server/0028-lithium-collections.goals.patch
@@ -7,10 +7,10 @@ Original code by CaffeineMC, licensed under LGPL v3
 You can find the original code on https://github.com/CaffeineMC/lithium-fabric (Yarn mappings)

 diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
-index 02978315bc2b828cc603ce7478408f3f82c249c2..d8ee71cb3afc0f63669d26c4160f7cd7ed2fd453 100644
+index a2cca3d528625d49411a94e2b6ec578fec9b10da..e5c8b62cd431a86d9f1e5e4f1e48adfef81518c8 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
-@@ -13,6 +13,7 @@ import java.util.function.Supplier;
+@@ -14,6 +14,7 @@ import java.util.function.Supplier;
 import java.util.stream.Stream;
 import net.minecraft.util.profiling.ProfilerFiller;
 import org.slf4j.Logger;
@@ -18,7 +18,7 @@ index 02978315bc2b828cc603ce7478408f3f82c249c2..d8ee71cb3afc0f63669d26c4160f7cd7
 
 public class GoalSelector {
     private static final Logger LOGGER = LogUtils.getLogger();
-@@ -28,7 +29,7 @@ public class GoalSelector {
+@@ -29,7 +30,7 @@ public class GoalSelector {
         }
     };
     private final Map<Goal.Flag, WrappedGoal> lockedFlags = new EnumMap<>(Goal.Flag.class);
--- a/patches/server/0029-lithium-collections.gamerules.patch
+++ b/patches/server/0029-lithium-collections.gamerules.patch
--- a/patches/server/0030-lithium-collections.attributes.patch
+++ b/patches/server/0030-lithium-collections.attributes.patch
@@ -7,7 +7,7 @@ Original code by CaffeineMC, licensed under LGPL v3
 You can find the original code on https://github.com/CaffeineMC/lithium-fabric (Yarn mappings)

 diff --git a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
-index 6b0855cffb901dbc7dcc5fd44506275206bc9a2d..d3e52ae7c563cf5331ac6ebcffa5daffa5fff7df 100644
+index 74d4f017484f13754a1f266625331a4124976afe..ce48d8a8382b78262d20151ba721ca1c99a9e189 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
@@ -17,11 +17,13 @@ import net.minecraft.nbt.CompoundTag;
--- a/patches/server/0031-lithium-collections.entity_by_type.patch
+++ b/patches/server/0031-lithium-collections.entity_by_type.patch
@@ -7,7 +7,7 @@ Original code by CaffeineMC, licensed under LGPL v3
 You can find the original code on https://github.com/CaffeineMC/lithium-fabric (Yarn mappings)

 diff --git a/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java b/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java
-index 50a9f33aa31e9273c7c52d4bb2b02f0f884f7ba5..76a6febcfc3e5ab58dabac01b1d24050b14fcad6 100644
+index ebad17e6ec90a7f385cd38c5ec6c2772798d4562..535359546393de76b86fd4e66fc5d9faebb5c854 100644
 --- a/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java
 +++ b/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java
@@ -3,7 +3,6 @@ package net.minecraft.util;
@@ -18,9 +18,9 @@ index 50a9f33aa31e9273c7c52d4bb2b02f0f884f7ba5..76a6febcfc3e5ab58dabac01b1d24050
 import java.util.AbstractCollection;
 import java.util.Collection;
 import java.util.Collections;
-@@ -11,9 +10,10 @@ import java.util.Iterator;
- import java.util.List;
+@@ -12,9 +11,10 @@ import java.util.List;
 import java.util.Map;
+ import java.util.Map.Entry;
 import java.util.stream.Collectors;
 +import it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap; // DivineMC
 
@@ -30,12 +30,3 @@ index 50a9f33aa31e9273c7c52d4bb2b02f0f884f7ba5..76a6febcfc3e5ab58dabac01b1d24050
     private final Class<T> baseClass;
     private final List<T> allInstances = Lists.newArrayList();
 
-@@ -58,7 +58,7 @@ public class ClassInstanceMultiMap<T> extends AbstractCollection<T> {
-         if (!this.baseClass.isAssignableFrom(type)) {
-             throw new IllegalArgumentException("Don't know how to search for " + type);
-         } else {
-            List<? extends T> list = this.byClass.computeIfAbsent(type, (typeClass) -> {
-+            List list = this.byClass.computeIfAbsent(type, (typeClass) -> { // DivineMC - decompiling fix
-                 return this.allInstances.stream().filter(typeClass::isInstance).collect(Collectors.toList());
-             });
-             return Collections.unmodifiableCollection(list);
--- a/patches/server/0032-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch
+++ b/patches/server/0032-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch
@@ -7,7 +7,7 @@ Original code by CaffeineMC, licensed under LGPL v3
 You can find the original code on https://github.com/CaffeineMC/lithium-fabric (Yarn mappings)

 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 920af22a228a4debcd0384c843c7e964cc958405..0da35320a9215dc4f152d4ea977c421ea40a4a1b 100644
+index b48736a9f60c92d904e31f1faaacb6caf47d4070..45b51affcdafc6afb5cf6fd043310c85eb3fb7d1 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2623,6 +2623,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
--- a/patches/server/0033-Carpet-Fixes-Sheep-Optimization.patch
+++ b/patches/server/0033-Carpet-Fixes-Sheep-Optimization.patch
@@ -62,10 +62,10 @@ index 658f7943d275267d3fc556572831cc095259d12e..5ee9005f65edcfc3e3d20198ec1f6910
     private static CraftingContainer makeContainer(DyeColor firstColor, DyeColor secondColor) {
         TransientCraftingContainer transientcraftingcontainer = new TransientCraftingContainer(new AbstractContainerMenu((MenuType) null, -1) {
 diff --git a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java
-index 1bbaa8b1ca217b37d550e40b3742ac867289d05a..5fd3f43795101e95dce6c54bb917f4f2ae2ed18c 100644
+index 50db7431ec4a05a73ba3a5fb04b4c68427628982..15e0aa2a82a0be51ef04736ec636932092b34b32 100644
 --- a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java
 +++ b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java
-@@ -176,8 +176,10 @@ public class DivineConfig {
+@@ -165,8 +165,10 @@ public class DivineConfig {
 
     public static boolean recipeManagerOptimization = true;
     public static boolean biomeManagerOptimization = true;
--- a/patches/server/0034-vmp-use-linked-map-for-entity-trackers-for-faster-it.patch
+++ b/patches/server/0034-vmp-use-linked-map-for-entity-trackers-for-faster-it.patch
@@ -7,10 +7,10 @@ Original code by RelativityMC, licensed under MIT
 You can find the original code on https://github.com/RelativityMC/VMP-fabric (Yarn mappings)

 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 5e9ec3282fdea8a39328c59c5fe4453f457eee9c..bcc25342ed128e246ab40435df78da981a81a945 100644
+index bb412ca874b85d777c0e3565fcefcee15b23182b..e0a52d5b74754a5b30a1fc250b5a2200682b748b 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -88,6 +88,8 @@ import org.slf4j.Logger;
+@@ -107,6 +107,8 @@ import org.slf4j.Logger;
 import org.bukkit.craftbukkit.generator.CustomChunkGenerator;
 // CraftBukkit end
 
@@ -19,7 +19,7 @@ index 5e9ec3282fdea8a39328c59c5fe4453f457eee9c..bcc25342ed128e246ab40435df78da98
 public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider {
 
     private static final byte CHUNK_TYPE_REPLACEABLE = -1;
-@@ -232,7 +234,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -251,7 +253,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
         // Paper - rewrite chunk system
         this.tickingGenerated = new AtomicInteger();
         this.playerMap = new PlayerMap();
--- a/patches/server/0035-Improve-biome-temperature-cache.patch
+++ b/patches/server/0035-Improve-biome-temperature-cache.patch
@@ -5,19 +5,19 @@ Subject: [PATCH] Improve biome temperature cache


 diff --git a/src/main/java/net/minecraft/world/level/biome/Biome.java b/src/main/java/net/minecraft/world/level/biome/Biome.java
-index efca73d4de33028cf9df944f36e51b7b50f7a4c5..0062435a0782f05964269452eac560b9426bbc5a 100644
+index 57f3193ff761cbe45846a02a15d8da9c9e2e87ee..93a7647b19315aa4dc2f0a236fac330de4bed813 100644
 --- a/src/main/java/net/minecraft/world/level/biome/Biome.java
 +++ b/src/main/java/net/minecraft/world/level/biome/Biome.java
-@@ -67,7 +67,7 @@ public final class Biome {
+@@ -64,7 +64,7 @@ public final class Biome {
     private final MobSpawnSettings mobSettings;
     private final BiomeSpecialEffects specialEffects;
     // Pufferfish start - use our cache
-    private final ThreadLocal<gg.airplane.structs.Long2FloatAgingCache> temperatureCache = ThreadLocal.withInitial(() -> {
-+    private static final ThreadLocal<gg.airplane.structs.Long2FloatAgingCache> temperatureCache = ThreadLocal.withInitial(() -> { // DivineMC - Improve biome temperature cache
-         return Util.make(() -> {
-             /*
-             Long2FloatLinkedOpenHashMap long2FloatLinkedOpenHashMap = new Long2FloatLinkedOpenHashMap(1024, 0.25F) {
-@@ -125,7 +125,7 @@ public final class Biome {
+-    private final ThreadLocal<gg.airplane.structs.Long2FloatAgingCache> temperatureCache = ThreadLocal.withInitial(() -> Util.make(() -> {
+    private static final ThreadLocal<gg.airplane.structs.Long2FloatAgingCache> temperatureCache = ThreadLocal.withInitial(() -> Util.make(() -> {
+         /*
+         Long2FloatLinkedOpenHashMap long2FloatLinkedOpenHashMap = new Long2FloatLinkedOpenHashMap(1024, 0.25F) {
+             protected void rehash(int i) {
+@@ -118,7 +118,7 @@ public final class Biome {
     public float getTemperature(BlockPos blockPos) {
         long l = blockPos.asLong();
         // Pufferfish start
--- a/patches/server/0036-Suppress-errors-from-dirty-attributes.patch
+++ b/patches/server/0036-Suppress-errors-from-dirty-attributes.patch
@@ -30,12 +30,12 @@ index 04b98e23eed926d8473cc2464e04a5b9f18f1140..68463f809aea61d818fc428f1c8b8068
 
     }
 diff --git a/src/main/java/space/bxteam/divinemc/configuration/DivineWorldConfig.java b/src/main/java/space/bxteam/divinemc/configuration/DivineWorldConfig.java
-index 02dfe1750f9955a4b1b945e90491bdee13fe2ef5..c4b41a6a3fd2c3d7ff942fe8754a7333afb2c8ed 100644
+index 7e62ee9418d5add5b0b4ddb885d3a1745ce799b2..53082033dfb58b8097ac326025472ef64358b890 100644
 --- a/src/main/java/space/bxteam/divinemc/configuration/DivineWorldConfig.java
 +++ b/src/main/java/space/bxteam/divinemc/configuration/DivineWorldConfig.java
-@@ -115,4 +115,9 @@ public class DivineWorldConfig {
-         }
-         linearCrashOnBrokenSymlink = getBoolean("region-format.linear.crash-on-broken-symlink", linearCrashOnBrokenSymlink);
+@@ -94,4 +94,9 @@ public class DivineWorldConfig {
+     private void despawnShulkerBulletsOnOwnerDeath() {
+         despawnShulkerBulletsOnOwnerDeath = getBoolean("gameplay-mechanics.mob.shulker.despawn-bullets-on-player-death", despawnShulkerBulletsOnOwnerDeath);
     }
 +
 +    public boolean suppressErrorsFromDirtyAttributes = true;
--- a/patches/server/0037-vmp-skip-entity-move-if-movement-is-zero.patch
+++ b/patches/server/0037-vmp-skip-entity-move-if-movement-is-zero.patch
@@ -7,7 +7,7 @@ Original code by RelativityMC, licensed under MIT
 You can find the original code on https://github.com/RelativityMC/VMP-fabric (Yarn mappings)

 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d72d703308de39ff769e4311e2349f5fb13e7912..8dd5ec2dd8f87fdb183ae4508c576481af3db20d 100644
+index 2702de4408df4c74fef1951add2e38d92abc144c..30b72f4434b9fe9e490890c30400d058ecf3fa13 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -317,6 +317,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
--- a/patches/to-fix/0024-Fix-chat-signing.patch
+++ b/patches/to-fix/0024-Fix-chat-signing.patch
--- a/patches/to-fix/0025-Implement-Linear-region-format.patch
+++ b/patches/to-fix/0025-Implement-Linear-region-format.patch
--- a/patches/to-fix/0028-Add-Higher-Java-Version-for-Pufferfish-SIMD.patch
+++ b/patches/to-fix/0028-Add-Higher-Java-Version-for-Pufferfish-SIMD.patch
--- a/patches/to-fix/0036-lithium-precompute-shape-arrays.patch
+++ b/patches/to-fix/0036-lithium-precompute-shape-arrays.patch
--- a/patches/to-fix/0039-Async-Pathfinding.patch
+++ b/patches/to-fix/0039-Async-Pathfinding.patch
--- a/patches/to-fix/0040-C2ME-opts-math.patch
+++ b/patches/to-fix/0040-C2ME-opts-math.patch
--- a/patches/to-fix/0044-vmp-spawn_density_cap.patch
+++ b/patches/to-fix/0044-vmp-spawn_density_cap.patch