diff --git a/patches/server/0014-Optimize-TileEntity-load-unload.patch b/patches/server/0014-Optimize-TileEntity-load-unload.patch
index f9608a5..9b81af9 100644
--- a/patches/server/0014-Optimize-TileEntity-load-unload.patch
+++ b/patches/server/0014-Optimize-TileEntity-load-unload.patch
@@ -7,7 +7,7 @@ Original code by YatopiaMC, licensed under MIT
 You can find the original code on https://github.com/YatopiaMC/Yatopia
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index fc0afbf95d62aeddf8fb513b18c32ebe434d4b37..23ea2c68222e1c4094de193b3ab154b755e2823c 100644
+index 0cff48d2d94bf50192e932c35afc421bdda032d0..9d7d5acd04c6f8ed77d86241c058ea9b09f7449b 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -116,8 +116,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0017-Use-faster-random-implementation.patch b/patches/server/0017-Use-faster-random-implementation.patch
index 92c87a3..03f647c 100644
--- a/patches/server/0017-Use-faster-random-implementation.patch
+++ b/patches/server/0017-Use-faster-random-implementation.patch
@@ -134,7 +134,7 @@ index 19f77e377342ee461f0da8bc5378f2002fb9e94a..e6799eb40ec5e8c9f58aaafb7841a906
  
      public static int roundToward(int value, int divisor) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 8beecd901213cf026d10db0fdb16155fcee7b8f6..64ffade8cb140010578a61cd3d66ac48fc77cd1b 100644
+index 136ec7851f26c39b5b9a02ec791682fd5be2dbf1..ffcdd6c88aaae17075a491f35ebea3625e4914d2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -158,7 +158,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -212,7 +212,7 @@ index 1037d0a0cdd4fd7aa99a958ee969759c5883fdc0..99ab7bf2829b1355de452a368ac9971d
          this.currentState = FishingHook.FishHookState.FLYING;
          this.noCulling = true;
 diff --git a/src/main/java/net/minecraft/world/entity/raid/Raid.java b/src/main/java/net/minecraft/world/entity/raid/Raid.java
-index 1090d706e9cc4e4655e68501452cfa05bd3d4f29..f2d0d1f6b1ebfe2f66c2e385281cc2e435b0808b 100644
+index 7131226de05bc57830f7a68ba545ebfd19d33a59..d41bdd71ae1f722b5f108bed9282bf5bde348e90 100644
 --- a/src/main/java/net/minecraft/world/entity/raid/Raid.java
 +++ b/src/main/java/net/minecraft/world/entity/raid/Raid.java
 @@ -110,7 +110,7 @@ public class Raid {
@@ -273,7 +273,7 @@ index 6795132318a4e8b4c7a33b6f4b89a730ea66b97f..eebbf0b9d646ee5ae1bd48c821f122a7
          this.hitPlayers = Maps.newHashMap();
          this.level = world;
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 23ea2c68222e1c4094de193b3ab154b755e2823c..079f0cf57121c39773ef50b31ef7985b17feac0d 100644
+index 9d7d5acd04c6f8ed77d86241c058ea9b09f7449b..6a061119f98837da20d40c82160ef60c2b0cfaef 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -124,13 +124,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -328,7 +328,7 @@ index 6278115e3511fe2176b29122e2c733498f31bb5a..f25a0b94a001d13b698c9e9c1140e2dd
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index 10da0aa24b297ba24b29ba50086115440cfef515..416894241ccdbf0a41a194d1a477f7a3b72c9587 100644
+index e4591c0b3c8547cc6f4e2a0891fc378ee4334d9e..f4f964a2ef28840944b11404cdc6e41684e46af3 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 @@ -109,7 +109,7 @@ public abstract class ChunkGenerator implements BiomeManager.NoiseBiomeSource {
@@ -394,7 +394,7 @@ index 286c75989282c6d370ca64ac714ab15d784210ab..e3a2919e214c63aa8cc2334d30dade3d
          if (!s1.isEmpty()) {
              try {
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/feature/SpikeFeature.java b/src/main/java/net/minecraft/world/level/levelgen/feature/SpikeFeature.java
-index a928364c39703d6ac9ab4d9d3f06361132538dc0..b1caa6e5ebde9d3ee4f49e7ca265690829fe9b1f 100644
+index c03bf5bdb67b00c75f9fcfead882c4d944282244..300c994cd3cc0995eeb4914590afce8b6ad1d92b 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/feature/SpikeFeature.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/feature/SpikeFeature.java
 @@ -36,7 +36,7 @@ public class SpikeFeature extends Feature<SpikeConfiguration> {
diff --git a/patches/server/0018-Configurable-max-bees-in-hive.patch b/patches/server/0018-Configurable-max-bees-in-hive.patch
index 92235cd..e0a3643 100644
--- a/patches/server/0018-Configurable-max-bees-in-hive.patch
+++ b/patches/server/0018-Configurable-max-bees-in-hive.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable max bees in hive
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-index 9fcd835d219aafbe113ebb1b796052e07bf2b046..ffd89bb615b0e64f961a8f37f1d279c0fb6f43d1 100644
+index 5c784e1155c16dbbe1b75bb5bcb3d73793d146a3..8eabe7113822d35ff53390e981ea69ad5f07d67d 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 @@ -43,7 +43,7 @@ public class BeehiveBlockEntity extends BlockEntity {
diff --git a/patches/server/0019-Remove-TickTask.patch b/patches/server/0019-Remove-TickTask.patch
index 1f40606..8dacde2 100644
--- a/patches/server/0019-Remove-TickTask.patch
+++ b/patches/server/0019-Remove-TickTask.patch
@@ -57,7 +57,7 @@ index c691ee6208521b1570f0f25c8bbfd05146bd155c..1fe78da9a07bb2cadcd18ad4d30f9b10
      private void updateStatusIcon(ServerStatus metadata) {
          Optional<File> optional = Optional.of(this.getFile("server-icon.png")).filter(File::isFile);
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 00869dd65c994a26ff3d2124c03dfb9f006b443c..23a537dcabe03dc1e2d471d6774bb820bdc0dc1e 100644
+index d9c8e103546a9dee56e6e7a5db5a57d5158fc4ad..15b6dd0c39a1de09dd7aad88ec6054bf83b2a943 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -1274,10 +1274,12 @@ public class ServerChunkCache extends ChunkSource {
diff --git a/patches/server/0022-Remove-unnecessary-getLogger.patch b/patches/server/0022-Remove-unnecessary-getLogger.patch
index c4e7317..0e31c00 100644
--- a/patches/server/0022-Remove-unnecessary-getLogger.patch
+++ b/patches/server/0022-Remove-unnecessary-getLogger.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Remove unnecessary getLogger()
 Based off of a Patina Patch: https://github.com/PatinaMC/Patina/blob/921d83ac9506b6364ebac2ec57332da4fd8e6ada/patches/server/0023-Remove-unnecessary-LogManager.getLogger.patch
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 64ffade8cb140010578a61cd3d66ac48fc77cd1b..52c73615e9253bb99cfde9b45c96b20b4b21320d 100644
+index ffcdd6c88aaae17075a491f35ebea3625e4914d2..9719bbee04c2035c6374a48f80bf4389b33f57cf 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -163,7 +163,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0024-Don-t-create-new-random-instance.patch b/patches/server/0024-Don-t-create-new-random-instance.patch
index 145257d..6236e0a 100644
--- a/patches/server/0024-Don-t-create-new-random-instance.patch
+++ b/patches/server/0024-Don-t-create-new-random-instance.patch
@@ -55,7 +55,7 @@ index b0cbe7d42eef1865e84211844b351027a26a5956..711d5dc2a8b3a5f2a2a35cab59b5ecfd
          }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 079f0cf57121c39773ef50b31ef7985b17feac0d..d30ace3b23e94d6ab7f0aba202fdf57ec6af9df3 100644
+index 6a061119f98837da20d40c82160ef60c2b0cfaef..7a1dc47726e4b0033807eaebe28f15217564c022 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -124,13 +124,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0030-Remove-Spigot-tick-limiter.patch b/patches/server/0030-Remove-Spigot-tick-limiter.patch
index d9932cb..29b51a4 100644
--- a/patches/server/0030-Remove-Spigot-tick-limiter.patch
+++ b/patches/server/0030-Remove-Spigot-tick-limiter.patch
@@ -7,7 +7,7 @@ Original code by Titaniumtown, licensed under GNU General Public License v3.0
 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 d30ace3b23e94d6ab7f0aba202fdf57ec6af9df3..66ed9d9b4843f6bdd206dd120525415fa09f6cb1 100644
+index 7a1dc47726e4b0033807eaebe28f15217564c022..3dd10305430306b8cee7ec071378dd4bfab9db1e 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -174,8 +174,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0034-Configurable-flight-checks.patch b/patches/server/0034-Configurable-flight-checks.patch
index 71ceeda..9f1dfae 100644
--- a/patches/server/0034-Configurable-flight-checks.patch
+++ b/patches/server/0034-Configurable-flight-checks.patch
@@ -7,7 +7,7 @@ Original code by YatopiaMC, licensed under MIT
 You can find the original code on https://github.com/YatopiaMC/Yatopia
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 38bbc0d8cc844ab6b67a689fee95932537d42ebd..d61f58b210379bbac504a39977529bae887928d5 100644
+index 0f7f811510188f2b37443c5d2378a138dbf43b32..c01dedbb818af63f61b1c5c7a112aefbc7f65c67 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -318,7 +318,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0037-Don-t-load-chunks-for-physics.patch b/patches/server/0037-Don-t-load-chunks-for-physics.patch
index fec0ec6..e95c97a 100644
--- a/patches/server/0037-Don-t-load-chunks-for-physics.patch
+++ b/patches/server/0037-Don-t-load-chunks-for-physics.patch
@@ -7,7 +7,7 @@ Original code by Starlis, licensed under GNU General Public License v3.0
 You can find the original code on https://github.com/starlis/empirecraft
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 66ed9d9b4843f6bdd206dd120525415fa09f6cb1..ff9534270f00748a5f70c52a642df0e99318a1d7 100644
+index 3dd10305430306b8cee7ec071378dd4bfab9db1e..d3abd0e31e0ce8f27cee6ec674c90f6d87247fc4 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -896,7 +896,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -21,7 +21,7 @@ index 66ed9d9b4843f6bdd206dd120525415fa09f6cb1..ff9534270f00748a5f70c52a642df0e9
              try {
                  // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-index 3149f62b83240cd0a19c450ed1b717536250e873..6a9f39ba1df6911d4da96b3b9c7304ad23ce94bd 100644
+index a01d8bd11fe61979f3d38d461b177042a04752ac..ae5b5442d10a2a274a1ff2facb9c5921eea5b3e0 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
 @@ -930,7 +930,8 @@ public abstract class BlockBehaviour {
diff --git a/patches/server/0038-Do-not-process-chat-commands-before-player-has-joine.patch b/patches/server/0038-Do-not-process-chat-commands-before-player-has-joine.patch
index 1cd59fb..7dc6fc0 100644
--- a/patches/server/0038-Do-not-process-chat-commands-before-player-has-joine.patch
+++ b/patches/server/0038-Do-not-process-chat-commands-before-player-has-joine.patch
@@ -7,7 +7,7 @@ Original code by Starlis, licensed under GNU General Public License v3.0
 You can find the original code on https://github.com/starlis/empirecraft
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d61f58b210379bbac504a39977529bae887928d5..3d82574c0c2b9d5861a087f062e1dd61e238dbcf 100644
+index c01dedbb818af63f61b1c5c7a112aefbc7f65c67..6fc8c5fc8a14e1ea19da8bd01199f7f8be7ce33a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2068,6 +2068,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0054-Fix-the-dead-lagging-the-server.patch b/patches/server/0054-Fix-the-dead-lagging-the-server.patch
index 122c2ee..36f589e 100644
--- a/patches/server/0054-Fix-the-dead-lagging-the-server.patch
+++ b/patches/server/0054-Fix-the-dead-lagging-the-server.patch
@@ -7,7 +7,7 @@ Original code by PurpurMC, licensed under MIT
 You can find the original code on https://github.com/PurpurMC/Purpur
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6f518d16536360999f8dc49221e5d5573607692a..83268871928bfdb629290334475d7d9bf4f16c89 100644
+index 9719bbee04c2035c6374a48f80bf4389b33f57cf..6c48c882e297f74b507ac363507da3586dad1d81 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1763,6 +1763,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0055-Alternative-Keepalive-Handling.patch b/patches/server/0055-Alternative-Keepalive-Handling.patch
index ff64a66..f071538 100644
--- a/patches/server/0055-Alternative-Keepalive-Handling.patch
+++ b/patches/server/0055-Alternative-Keepalive-Handling.patch
@@ -7,7 +7,7 @@ Original code by PurpurMC, licensed under MIT
 You can find the original code on https://github.com/PurpurMC/Purpur
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3d82574c0c2b9d5861a087f062e1dd61e238dbcf..2ee11525447c1f3a77d3c1b5c0e33aef778a64e0 100644
+index 6fc8c5fc8a14e1ea19da8bd01199f7f8be7ce33a..86c213ae5733d407c534e5b5e75e1330c61c8289 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -227,6 +227,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0058-Fix-stuck-in-portals.patch b/patches/server/0058-Fix-stuck-in-portals.patch
index d9a3bc3..e40ebbe 100644
--- a/patches/server/0058-Fix-stuck-in-portals.patch
+++ b/patches/server/0058-Fix-stuck-in-portals.patch
@@ -19,7 +19,7 @@ index 0011192cdba6dcb7ca125ae4a49ca89a93cc40f2..ade6a3d0e90e8c82e3e90bd2d12369cc
                  // CraftBukkit end
                  this.setLevel(worldserver);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 83268871928bfdb629290334475d7d9bf4f16c89..6dcbdcce41ec26c25047d47c7dbb683ea5cb5185 100644
+index 6c48c882e297f74b507ac363507da3586dad1d81..e05b0c80150d5db8696d5bb78ef3eb70363cd61c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2724,12 +2724,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0059-Entities-can-use-portals-configuration.patch b/patches/server/0059-Entities-can-use-portals-configuration.patch
index acca47a..977e1fe 100644
--- a/patches/server/0059-Entities-can-use-portals-configuration.patch
+++ b/patches/server/0059-Entities-can-use-portals-configuration.patch
@@ -7,7 +7,7 @@ Original code by PurpurMC, licensed under MIT
 You can find the original code on https://github.com/PurpurMC/Purpur
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6dcbdcce41ec26c25047d47c7dbb683ea5cb5185..9b2140c6591892f248e3e459b1ddd6f3ccf662ee 100644
+index e05b0c80150d5db8696d5bb78ef3eb70363cd61c..7ad3ac00dd1107cca3be8ed02bddc2b55be6dcca 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2729,7 +2729,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0061-Signs-allow-color-codes.patch b/patches/server/0061-Signs-allow-color-codes.patch
index ad5bec8..c2a0409 100644
--- a/patches/server/0061-Signs-allow-color-codes.patch
+++ b/patches/server/0061-Signs-allow-color-codes.patch
@@ -19,7 +19,7 @@ index ade6a3d0e90e8c82e3e90bd2d12369ccd0760eca..c93c3c3f83a60aa1769607a26148f2eb
          this.connection.send(new ClientboundBlockUpdatePacket(this.level, sign.getBlockPos()));
          this.connection.send(new ClientboundOpenSignEditorPacket(sign.getBlockPos()));
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2ee11525447c1f3a77d3c1b5c0e33aef778a64e0..bfb1791b81e926597721ad8ef57f71af6c952c05 100644
+index 86c213ae5733d407c534e5b5e75e1330c61c8289..4707ab9c34f814906a9d638d5c3b956f539c5479 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3074,11 +3074,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0066-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0066-Skip-entity-move-if-movement-is-zero.patch
index abfe1f9..3972bb4 100644
--- a/patches/server/0066-Skip-entity-move-if-movement-is-zero.patch
+++ b/patches/server/0066-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 9b2140c6591892f248e3e459b1ddd6f3ccf662ee..10026aa6eac019fb718556c5d5e624371d0f4e93 100644
+index 7ad3ac00dd1107cca3be8ed02bddc2b55be6dcca..c3d313f66cbd99cac091a3f8d6f67bbfdb20ee42 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -951,6 +951,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0069-Don-t-send-fire-packets-if-player-has-Fire-Resistanc.patch b/patches/server/0069-Don-t-send-fire-packets-if-player-has-Fire-Resistanc.patch
index 1be542f..de9b5d6 100644
--- a/patches/server/0069-Don-t-send-fire-packets-if-player-has-Fire-Resistanc.patch
+++ b/patches/server/0069-Don-t-send-fire-packets-if-player-has-Fire-Resistanc.patch
@@ -7,7 +7,7 @@ Original code by Cryptite, licensed under MIT
 You can find the original code on https://github.com/Cryptite/Slice
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 683b47c599f04fe7972cdc0bc1b6bb558dac3bd7..e9c9db3f2a48abca3781dece726bd0a2f1fbad9a 100644
+index c3d313f66cbd99cac091a3f8d6f67bbfdb20ee42..26c99c0809bba47b1fcb0093c576fe1d0f6596e1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -796,7 +796,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0070-Packet-obfuscation-and-reduction.patch b/patches/server/0070-Packet-obfuscation-and-reduction.patch
index 6d77d51..150c03d 100644
--- a/patches/server/0070-Packet-obfuscation-and-reduction.patch
+++ b/patches/server/0070-Packet-obfuscation-and-reduction.patch
@@ -158,7 +158,7 @@ index 042985988d11ca9f1bf6a62ec0622392c6e9b99f..756d4a9f7e2be49076af43212a7c1126
  
          if (this.entity instanceof LivingEntity) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 54ad8d84459e2d5d69aa7d7116acc905d92cf6e4..c3edfcdba181b134c8cf6a2a2179291c4f10abd7 100644
+index 26c99c0809bba47b1fcb0093c576fe1d0f6596e1..8f7afe463a29e2627746874831525beaf3d4033e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2980,7 +2980,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0072-World-Instance-Flag.patch b/patches/server/0072-World-Instance-Flag.patch
index 9bc8df2..68c347d 100644
--- a/patches/server/0072-World-Instance-Flag.patch
+++ b/patches/server/0072-World-Instance-Flag.patch
@@ -7,7 +7,7 @@ Original code by Cryptite, licensed under MIT
 You can find the original code on https://github.com/Cryptite/Slice
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index c7229e120d601619d2ea869d7aa506fb3b78cde4..6fd345bfb43818e23d63bfe14328f0a54d212c5c 100644
+index 2d2f1e3fe1c9314af18377458af74f8c6afa7603..4df7088e81ee6ccc7705d2c220ae80c373681c9e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -211,6 +211,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0076-Remove-Eigencraft-redstone-algo.patch b/patches/server/0076-Remove-Eigencraft-redstone-algo.patch
index f64abc8..84b7054 100644
--- a/patches/server/0076-Remove-Eigencraft-redstone-algo.patch
+++ b/patches/server/0076-Remove-Eigencraft-redstone-algo.patch
@@ -9,7 +9,7 @@ You can find the original code on https://gitlab.com/Titaniumtown/JettPack
 Reverts Eigencraft redstone from Paper in order for it to be replaced with alternate-current's redstone implementation
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index d71cd626bcbefc576f9c05b8885acc9fb2a33cd5..dbc9a4f494434bc8e938d8d149d74ee977f78483 100644
+index 5a5db15493cd9b83815c36487c2f38cb8ac76f3a..9cf6a124800cfe9ed88158025b25fbfd46fd420d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -77,16 +77,6 @@ public class PaperWorldConfig {
diff --git a/patches/server/0077-Port-alternate-current.patch b/patches/server/0077-Port-alternate-current.patch
index d9ee1b6..73d15ef 100644
--- a/patches/server/0077-Port-alternate-current.patch
+++ b/patches/server/0077-Port-alternate-current.patch
@@ -2042,7 +2042,7 @@ index 0000000000000000000000000000000000000000..5d58615073c2b2018a3625544e7e702c
 +}
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 6d0369bb8215eae6ea852c36597e88ebe880ff34..5717c9362bffdd5b6b3eb4ca2efd1e13ee0d1329 100644
+index 4df7088e81ee6ccc7705d2c220ae80c373681c9e..35c1604ff678a5344bc9de824eb2788561d2dcaf 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -161,8 +161,14 @@ import org.bukkit.event.weather.LightningStrikeEvent;
diff --git a/patches/server/0081-lithium-fast-math.patch b/patches/server/0081-lithium-fast-math.patch
index 4513805..b5bbc24 100644
--- a/patches/server/0081-lithium-fast-math.patch
+++ b/patches/server/0081-lithium-fast-math.patch
@@ -7,7 +7,7 @@ Original code by CaffeineMC, licensed under GNU Lesser General Public License v3
 You can find the original code on https://github.com/CaffeineMC/lithium-fabric (Yarn mappings)
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index 5a7836a4d5d11b244f8ef7fe4b116a721f088e65..49a79df01682b90b80d203eafb1b07276032433b 100644
+index 7764b1f86aca33dc227bf4357c20839b8820eb67..9fc782fadc1daffb12ce02a6b1c3b4c4e60d8ae7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -725,12 +725,12 @@ public class PaperCommand extends Command {
@@ -282,7 +282,7 @@ index d212774a4e7c578683394fb4a6c90ce5ce875711..d82fbd657a615d84afb0c6dfdc4b1a58
  
          i = Mth.clamp(i, (int) 0, (int) 15);
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index 416894241ccdbf0a41a194d1a477f7a3b72c9587..036718e2f6fe06cf97a8c8341d8a288c8defefb2 100644
+index f4f964a2ef28840944b11404cdc6e41684e46af3..21d47eba76598e9553b1996b5da4cd72a7d9617b 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 @@ -118,8 +118,8 @@ public abstract class ChunkGenerator implements BiomeManager.NoiseBiomeSource {
diff --git a/patches/server/0084-Skip-cloning-loot-parameters.patch b/patches/server/0084-Skip-cloning-loot-parameters.patch
new file mode 100644
index 0000000..0c184ab
--- /dev/null
+++ b/patches/server/0084-Skip-cloning-loot-parameters.patch
@@ -0,0 +1,34 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: RedeObscurity <zmonsterpotente@gmail.com>
+Date: Tue, 28 Dec 2021 14:48:49 -0300
+Subject: [PATCH] Skip cloning loot parameters
+
+Original code by RedeObscurity, licensed under MIT
+You can find the original code on https://github.com/RedeObscurity/Obscurity
+
+diff --git a/src/main/java/net/minecraft/advancements/Advancement.java b/src/main/java/net/minecraft/advancements/Advancement.java
+index c534055f90b98942b9d7d152fd502cf5387c995b..d48d1a998f48d05cb9aca51ec41a43190b253dbc 100644
+--- a/src/main/java/net/minecraft/advancements/Advancement.java
++++ b/src/main/java/net/minecraft/advancements/Advancement.java
+@@ -46,7 +46,7 @@ public class Advancement {
+     public Advancement(ResourceLocation id, @Nullable Advancement parent, @Nullable DisplayInfo display, AdvancementRewards rewards, Map<String, Criterion> criteria, String[][] requirements) {
+         this.id = id;
+         this.display = display;
+-        this.criteria = ImmutableMap.copyOf(criteria);
++        this.criteria = java.util.Collections.unmodifiableMap(criteria); // Obscurity - Skip cloning loot parameters
+         this.parent = parent;
+         this.rewards = rewards;
+         this.requirements = requirements;
+diff --git a/src/main/java/net/minecraft/core/MappedRegistry.java b/src/main/java/net/minecraft/core/MappedRegistry.java
+index 76b0b8b03c1d1c548ff67cfd6e6b127764f951d9..de25d881a151cb98579a5516e0813da872b6a827 100644
+--- a/src/main/java/net/minecraft/core/MappedRegistry.java
++++ b/src/main/java/net/minecraft/core/MappedRegistry.java
+@@ -243,7 +243,7 @@ public class MappedRegistry<T> extends WritableRegistry<T> {
+             });
+             return mappedRegistry;
+         }, (mappedRegistry) -> {
+-            return ImmutableMap.copyOf(mappedRegistry.keyStorage);
++            return java.util.Collections.unmodifiableMap(mappedRegistry.keyStorage); // Obscurity - Skip cloning loot parameters
+         });
+     }
+