diff --git a/gradle.properties b/gradle.properties
index 20f030a..91a0867 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = space.bxteam.divinemc
 
 mcVersion = 1.21
 version = 1.21-R0.1-SNAPSHOT
-purpurRef = 8f0f20df9acdb4e46b4bf36444ff5ddaf5f0413a
+purpurRef = eadfff73eaf7a17a0191c539f9aed81b4e55d65d
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0001-Divine-Branding.patch b/patches/server/0001-Divine-Branding.patch
index a57126b..f8bfb76 100644
--- a/patches/server/0001-Divine-Branding.patch
+++ b/patches/server/0001-Divine-Branding.patch
@@ -280,10 +280,10 @@ index 99597258e8e88cd9e2c901c4ac3ff7faeeabee2b..7bbbdf2895776f12ebc153dc83f4d53b
  
          if (stream != null) {
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 08230ef6a705904440a677fba4c65386a3f540ed..5cf7b386dd665591597d58dd92ee3612df04b759 100644
+index f51cc3de3ca935ef90f7f0e9dd0506b856fc55f3..88e172c4f79f9f44b9de79a75acc2365bd0f2af8 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
-@@ -155,14 +155,14 @@ public class WatchdogThread extends io.papermc.paper.util.TickThread // Paper -
+@@ -155,14 +155,14 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre
                  if (isLongTimeout) {
                  // Paper end
                  log.log( Level.SEVERE, "------------------------------" );
@@ -301,7 +301,7 @@ index 08230ef6a705904440a677fba4c65386a3f540ed..5cf7b386dd665591597d58dd92ee3612
                  //
                  if ( net.minecraft.world.level.Level.lastPhysicsProblem != null )
                  {
-@@ -184,12 +184,12 @@ public class WatchdogThread extends io.papermc.paper.util.TickThread // Paper -
+@@ -184,12 +184,12 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre
                  // Paper end
                  } else
                  {
@@ -316,7 +316,7 @@ index 08230ef6a705904440a677fba4c65386a3f540ed..5cf7b386dd665591597d58dd92ee3612
                  ca.spottedleaf.moonrise.patches.chunk_system.scheduling.ChunkTaskScheduler.dumpAllChunkLoadInfo(MinecraftServer.getServer(), isLongTimeout); // Paper - rewrite chunk system
                  this.dumpTickingInfo(); // Paper - log detailed tick information
                  WatchdogThread.dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log );
-@@ -205,7 +205,7 @@ public class WatchdogThread extends io.papermc.paper.util.TickThread // Paper -
+@@ -205,7 +205,7 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre
                      WatchdogThread.dumpThread( thread, log );
                  }
                  } else {
diff --git a/patches/server/0002-Divine-Configuration.patch b/patches/server/0002-Divine-Configuration.patch
index 07526d3..fccc8a0 100644
--- a/patches/server/0002-Divine-Configuration.patch
+++ b/patches/server/0002-Divine-Configuration.patch
@@ -34,7 +34,7 @@ index 39a7abeeff53a608774dc34226e9b5e12bd5b5d2..6833a7710cfb2716c8522d8a841bee66
          this.setFlightAllowed(dedicatedserverproperties.allowFlight);
          this.setMotd(dedicatedserverproperties.motd);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index ba2254ef7688177eff2ed8115726b7b551620560..27a52e96f5bc97c1e1aceb88088595db93a35b20 100644
+index ed313b0424b2e1e1335ee3e3bd4d9cfd15f24b39..4d2e285657ad2c060c384e1e4027e00d9cf25346 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -83,6 +83,7 @@ import net.minecraft.world.phys.AABB;
@@ -62,7 +62,7 @@ index ba2254ef7688177eff2ed8115726b7b551620560..27a52e96f5bc97c1e1aceb88088595db
          this.generator = gen;
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 002a3ee08d7e009ef1e4bd3bc274aa608846b219..7c6af53de9b3b7552bf69aaef6ce2ff179bf2ece 100644
+index 2e440d3c0b4bd42d6bc8409778473f574e22c54b..7257d1052746d90662bb2a796b2f437fc0a2e9ab 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
@@ -74,7 +74,7 @@ index 002a3ee08d7e009ef1e4bd3bc274aa608846b219..7c6af53de9b3b7552bf69aaef6ce2ff1
  public final class CraftServer implements Server {
      private final String serverName = io.papermc.paper.ServerBuildInfo.buildInfo().brandName(); // Paper
      private final String serverVersion;
-@@ -1074,6 +1076,7 @@ public final class CraftServer implements Server {
+@@ -1083,6 +1085,7 @@ public final class CraftServer implements Server {
          org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
          org.purpurmc.purpur.PurpurConfig.init((File) console.options.valueOf("purpur-settings")); // Purpur
@@ -82,7 +82,7 @@ index 002a3ee08d7e009ef1e4bd3bc274aa608846b219..7c6af53de9b3b7552bf69aaef6ce2ff1
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
              world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -1090,6 +1093,7 @@ public final class CraftServer implements Server {
+@@ -1099,6 +1102,7 @@ public final class CraftServer implements Server {
              }
              world.spigotConfig.init(); // Spigot
              world.purpurConfig.init(); // Purpur
@@ -90,7 +90,7 @@ index 002a3ee08d7e009ef1e4bd3bc274aa608846b219..7c6af53de9b3b7552bf69aaef6ce2ff1
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -1107,6 +1111,7 @@ public final class CraftServer implements Server {
+@@ -1116,6 +1120,7 @@ public final class CraftServer implements Server {
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
          org.purpurmc.purpur.PurpurConfig.registerCommands(); // Purpur
@@ -98,7 +98,7 @@ index 002a3ee08d7e009ef1e4bd3bc274aa608846b219..7c6af53de9b3b7552bf69aaef6ce2ff1
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -3056,6 +3061,13 @@ public final class CraftServer implements Server {
+@@ -3065,6 +3070,13 @@ public final class CraftServer implements Server {
          }
          // Purpur end
  
@@ -113,7 +113,7 @@ index 002a3ee08d7e009ef1e4bd3bc274aa608846b219..7c6af53de9b3b7552bf69aaef6ce2ff1
          public void restart() {
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index f0e7f729e58fa1b297ae07edcf808f6211262189..33a5a64b1dfea4d284f45fd80867144d3cdec501 100644
+index 577b2f19e625ca71b13477eb96e42e04954fa449..52fb3f237a986b79339e2e1142d33a8d5291bdce 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -184,6 +184,14 @@ public class Main {
diff --git a/patches/server/0003-Optimize-default-values-for-configs.patch b/patches/server/0003-Optimize-default-values-for-configs.patch
index b992ea1..73dcb2e 100644
--- a/patches/server/0003-Optimize-default-values-for-configs.patch
+++ b/patches/server/0003-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 b8499c1cea97a1a88a53053bc7da132f2fd3928d..69fbb3ff023db00fb82a1c0235c05afdacb47abd 100644
+index 379452394679c466a09441d4c12882d0d00d9ef3..ea48befad95da428751dc4a0991f34e6dc7f6d04 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 @@ -330,9 +330,9 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -216,7 +216,7 @@ index 54abd6874a64c669fc22448849febc9ef7c0f95e..59cf59bd127fd1fe1c8dbac2086ddbaf
          useAlternateKeepAlive = getBoolean("settings.use-alternate-keepalive", useAlternateKeepAlive);
      }
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index db9c812cf7267adf0bfd8be7368140e91245d640..b8534797f15da80117d84f569fc54864ae453f86 100644
+index 0507182aa6d47da9693363f6b0fadd40d06d66b4..91e3c172140dd0ff30d2ffba2b937d3b87db3cce 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -335,7 +335,7 @@ public class SpigotConfig
@@ -228,7 +228,7 @@ index db9c812cf7267adf0bfd8be7368140e91245d640..b8534797f15da80117d84f569fc54864
      }
  
      public static double movedWronglyThreshold;
-@@ -396,8 +396,10 @@ public class SpigotConfig
+@@ -399,8 +399,10 @@ public class SpigotConfig
      public static boolean logVillagerDeaths;
      public static boolean logNamedDeaths;
      private static void logDeaths() {
diff --git a/patches/server/0013-Fix-MC-93018.patch b/patches/server/0013-Fix-MC-93018.patch
index 4847949..abf0481 100644
--- a/patches/server/0013-Fix-MC-93018.patch
+++ b/patches/server/0013-Fix-MC-93018.patch
@@ -6,10 +6,10 @@ 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 3d032d3f53cc3281bad173f7f9d139101ef6beaa..60f7899b2779bd3dd7cd88690fa04e128b5ffa6e 100644
+index ba6036633c1977b7f41b3bd0dd31370924b4bf35..e6ce9af322adf35074f154d75bea66e7750f4dd7 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-@@ -776,14 +776,17 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
+@@ -781,14 +781,17 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
      public boolean canMate(Animal other) {
          if (other == this) {
              return false;
diff --git a/patches/server/0015-vmp-skip-entity-move-if-movement-is-zero.patch b/patches/server/0015-vmp-skip-entity-move-if-movement-is-zero.patch
index 1d2f4f5..5756373 100644
--- a/patches/server/0015-vmp-skip-entity-move-if-movement-is-zero.patch
+++ b/patches/server/0015-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 476bf0c7f1d2a398caf69152638dbe56a64a1d43..c9e712466434de366bb8072126eee092ec01f60e 100644
+index 4e30e11bd0917cda02fd70978dbc2d82affd3926..d80badbdfa28f068f4b0434355b2e21b50b44678 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -324,6 +324,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -30,7 +30,7 @@ index 476bf0c7f1d2a398caf69152638dbe56a64a1d43..c9e712466434de366bb8072126eee092
 +        // DivineMC end
          final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity
          // Paper start - detailed watchdog information
-         io.papermc.paper.util.TickThread.ensureTickThread("Cannot move an entity off-main");
+         ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread("Cannot move an entity off-main");
 @@ -4206,6 +4213,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
  
diff --git a/patches/server/0016-vmp-use-linked-map-for-entity-trackers-for-faster-it.patch b/patches/server/0016-vmp-use-linked-map-for-entity-trackers-for-faster-it.patch
index 9ea0b67..0f4f6dd 100644
--- a/patches/server/0016-vmp-use-linked-map-for-entity-trackers-for-faster-it.patch
+++ b/patches/server/0016-vmp-use-linked-map-for-entity-trackers-for-faster-it.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/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index ecd02b10c4120a7d7342b12ec95be0ee56318333..f5dd325b755beefa159957864ef0d3a381b3af86 100644
+index 989ba0fa3b928866d5a7163d1663d30d276e1264..34aa16cdfb12f20dba4e8e43cf9c1a0fb4061361 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -12,6 +12,7 @@ import com.mojang.datafixers.DataFixer;
@@ -18,7 +18,7 @@ index ecd02b10c4120a7d7342b12ec95be0ee56318333..f5dd325b755beefa159957864ef0d3a3
  import it.unimi.dsi.fastutil.longs.Long2ByteMap;
  import it.unimi.dsi.fastutil.longs.Long2ByteOpenHashMap;
  import it.unimi.dsi.fastutil.longs.Long2LongMap;
-@@ -204,7 +205,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -179,7 +180,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          this.toDrop = new LongOpenHashSet();
          this.tickingGenerated = new AtomicInteger();
          this.playerMap = new PlayerMap();
diff --git a/patches/server/0028-Delete-Timings.patch b/patches/server/0028-Delete-Timings.patch
index 678eb23..873ee76 100644
--- a/patches/server/0028-Delete-Timings.patch
+++ b/patches/server/0028-Delete-Timings.patch
@@ -826,7 +826,7 @@ index 01efbc507b3d58f13f78ee286f93df40cdc3f0cb..1f7f68aad97ee73763c042837f239bdc
                      } catch (Exception exception) {
                          if (exception instanceof ReportedException) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b8628e9ab434feaae40c65f0fa016f6d57352f38..de06e4c2f846179be391f13edf6fb7a64718ff0c 100644
+index 2f170b3af816a096ec9e13888418f4bf00cce86b..cb6d77ba765a2700ffa2531a687b81a10b1a4df3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -3,7 +3,6 @@ package net.minecraft.server;
@@ -872,9 +872,9 @@ index b8628e9ab434feaae40c65f0fa016f6d57352f38..de06e4c2f846179be391f13edf6fb7a6
          // Paper end
          new com.destroystokyo.paper.event.server.ServerTickStartEvent(this.tickCount+1).callEvent(); // Paper - Server Tick Events
  
-@@ -1656,9 +1651,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1655,9 +1650,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+         //this.profiler.pop(); // Purpur
          // Paper end - Incremental chunk and player saving
-         io.papermc.paper.util.CachedLists.reset(); // Paper
          // Paper start - move executeAll() into full server tick timing
 -        //try (co.aikar.timings.Timing ignored = MinecraftTimings.processTasksTimer.startTiming()) { // Purpur
 -            this.runAllTasks();
@@ -883,7 +883,7 @@ index b8628e9ab434feaae40c65f0fa016f6d57352f38..de06e4c2f846179be391f13edf6fb7a6
          // Paper end
          // Paper start - Server Tick Events
          long endTime = System.nanoTime();
-@@ -1681,7 +1674,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1680,7 +1673,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.logTickMethodTime(i);
          //this.profiler.pop(); // Purpur
          org.spigotmc.WatchdogThread.tick(); // Spigot
@@ -928,7 +928,7 @@ index 386fe1aca665e745babe3ca24f393fcaee36c663..25e05b03892cf1f8844cc2111348787d
          // Paper start
          if (waitableArray[0] != null) {
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index c0e19a44de942ed82cdcd5bb1688be2b4cbc0d23..49cd0d502a897b32c185e1437d8fb7ebbc602556 100644
+index 34aa16cdfb12f20dba4e8e43cf9c1a0fb4061361..472ceaf17d15f783ff9c80bb060396a64431f53c 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1,6 +1,5 @@
@@ -939,7 +939,7 @@ index c0e19a44de942ed82cdcd5bb1688be2b4cbc0d23..49cd0d502a897b32c185e1437d8fb7eb
  import com.google.common.collect.ImmutableList.Builder;
  import com.google.common.collect.Iterables;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 665d45ba1129a72a1fb393d524bfa845b7a8189d..aed0e61f9249bb9c3cd966e48322830fe2e646e8 100644
+index a4ea3eca166510e05bc53504d2f1040e3bead39a..87368cc8ed4746073a04521d221713f00ece4e6f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1,7 +1,6 @@
@@ -950,7 +950,7 @@ index 665d45ba1129a72a1fb393d524bfa845b7a8189d..aed0e61f9249bb9c3cd966e48322830f
  import com.google.common.collect.Lists;
  import com.mojang.datafixers.DataFixer;
  import com.mojang.datafixers.util.Pair;
-@@ -1311,9 +1310,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -1330,9 +1329,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
                  currentlyTickingEntity.lazySet(entity);
              }
              // Paper end - log detailed entity tick information
@@ -960,7 +960,7 @@ index 665d45ba1129a72a1fb393d524bfa845b7a8189d..aed0e61f9249bb9c3cd966e48322830f
          /*if (!org.spigotmc.ActivationRange.checkIfActive(entity)) { // Paper - comment out - EAR 2, reimplement below
              entity.tickCount++;
              timer = entity.getType().inactiveTickTimer.startTiming(); try { // Paper - timings
-@@ -1336,7 +1333,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -1355,7 +1352,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
          });*/ // Purpur
          //gameprofilerfiller.incrementCounter("tickNonPassenger"); // Purpur
          if (isActive) { // Paper - EAR 2
@@ -1061,7 +1061,7 @@ index 09a7b418ddf564c0be13297f7c216db2e7ae1578..1e26b1099139d76e49fce14ee72061e1
          this.scanRate = senseInterval;
          this.timeToTick = (long)RANDOM.nextInt(senseInterval);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 24511ef4a618348b7a6fceefc5e6cdb359bb6655..6241647a1d85073942c821f66a4812bef15543f2 100644
+index e54543bfb6cfee1b79c4ce7df9967a9146a7a0a2..5093e545e81a19c0554ce6ecf57a07afd291ab42 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -176,7 +176,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
diff --git a/patches/server/0036-Optimize-CraftServer.getWorld-UUID.patch b/patches/server/0036-Optimize-CraftServer.getWorld-UUID.patch
index 977e4f4..b954992 100644
--- a/patches/server/0036-Optimize-CraftServer.getWorld-UUID.patch
+++ b/patches/server/0036-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 7c6af53de9b3b7552bf69aaef6ce2ff179bf2ece..0a0ba7c205f5acef31e9b825022c9598d1218b5a 100644
+index 7257d1052746d90662bb2a796b2f437fc0a2e9ab..1a9964d77202df87b05fb47ba1edb62e7be17049 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -266,6 +266,7 @@ import javax.annotation.Nullable; // Paper
@@ -25,7 +25,7 @@ index 7c6af53de9b3b7552bf69aaef6ce2ff179bf2ece..0a0ba7c205f5acef31e9b825022c9598
      private YamlConfiguration configuration;
      private YamlConfiguration commandsConfiguration;
      private final Yaml yaml = new Yaml(new SafeConstructor(new LoaderOptions()));
-@@ -1492,6 +1494,7 @@ public final class CraftServer implements Server {
+@@ -1501,6 +1503,7 @@ public final class CraftServer implements Server {
              this.getLogger().log(Level.SEVERE, null, ex);
          }
  
@@ -33,7 +33,7 @@ index 7c6af53de9b3b7552bf69aaef6ce2ff179bf2ece..0a0ba7c205f5acef31e9b825022c9598
          this.worlds.remove(world.getName().toLowerCase(Locale.ROOT));
          this.console.removeLevel(handle);
          return true;
-@@ -1510,6 +1513,7 @@ public final class CraftServer implements Server {
+@@ -1519,6 +1522,7 @@ public final class CraftServer implements Server {
  
      @Override
      public World getWorld(UUID uid) {
@@ -41,7 +41,7 @@ index 7c6af53de9b3b7552bf69aaef6ce2ff179bf2ece..0a0ba7c205f5acef31e9b825022c9598
          for (World world : this.worlds.values()) {
              if (world.getUID().equals(uid)) {
                  return world;
-@@ -1533,6 +1537,7 @@ public final class CraftServer implements Server {
+@@ -1542,6 +1546,7 @@ public final class CraftServer implements Server {
              System.out.println("World " + world.getName() + " is a duplicate of another world and has been prevented from loading. Please delete the uid.dat file from " + world.getName() + "'s world directory if you want to be able to load the duplicate world.");
              return;
          }
diff --git a/patches/server/0047-Petal-Reduce-work-done-by-game-event-system.patch b/patches/server/0047-Petal-Reduce-work-done-by-game-event-system.patch
index b85918b..fddde9c 100644
--- a/patches/server/0047-Petal-Reduce-work-done-by-game-event-system.patch
+++ b/patches/server/0047-Petal-Reduce-work-done-by-game-event-system.patch
@@ -34,7 +34,7 @@ index a74732902c0494c67e6acf2fc04581ff9c46b832..42752cf9aa9668f4f813adc177b7ef97
              LivingEntity entityliving1 = deadEntity.getLastHurtByMob();
  
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 7411e3d132dddde4599c182384f317679de1f2bf..f8fce0fa89ab383050fc7dd373fa964242df2bcd 100644
+index 3ec4ba40f6ff44365eaa4b33ac447c191670f259..9da1dbda23d01d6e63d7ed4e18664e9f46a7c8cb 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -82,7 +82,18 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
@@ -66,7 +66,7 @@ index 7411e3d132dddde4599c182384f317679de1f2bf..f8fce0fa89ab383050fc7dd373fa9642
          Heightmap.Types[] aheightmap_type = Heightmap.Types.values();
          int j = aheightmap_type.length;
  
-@@ -220,9 +231,23 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
+@@ -231,9 +242,23 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
          Level world = this.level;
  
          if (world instanceof ServerLevel worldserver) {
@@ -93,7 +93,7 @@ index 7411e3d132dddde4599c182384f317679de1f2bf..f8fce0fa89ab383050fc7dd373fa9642
          } else {
              return super.getListenerRegistry(ySectionCoord);
          }
-@@ -611,7 +636,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
+@@ -622,7 +647,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
      }
  
      private void removeGameEventListenerRegistry(int ySectionCoord) {
diff --git a/patches/server/0053-Fix-MC-119417.patch b/patches/server/0053-Fix-MC-119417.patch
index 3cd66a0..546453e 100644
--- a/patches/server/0053-Fix-MC-119417.patch
+++ b/patches/server/0053-Fix-MC-119417.patch
@@ -7,10 +7,10 @@ Original bug on Mojira: https://bugs.mojang.com/browse/MC-119417
 Took here: https://github.com/Winds-Studio/Leaf/blob/ver/1.21/patches/server/0082-Fix-MC-119417.patch
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 4b5d0ccd37534bd987d997338033e363a7a56b76..ee616d091d4755c6959e3aee19ecd08fa148a799 100644
+index 21dfca344a7b98dfd4e20bebde6c743e5cd8c932..bf2bfe391a32a26be3f2e23e96bded1650c0dd30 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2255,6 +2255,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
+@@ -2253,6 +2253,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
              this.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.CHANGE_GAME_MODE, (float) gameMode.getId()));
              if (gameMode == GameType.SPECTATOR) {
                  this.removeEntitiesOnShoulder();