diff --git a/nms-patches/MinecraftServer.patch b/nms-patches/MinecraftServer.patch
index e91f7e3ba6..754ef02e07 100644
--- a/nms-patches/MinecraftServer.patch
+++ b/nms-patches/MinecraftServer.patch
@@ -349,7 +349,7 @@
          BlockPosition blockposition = worldserver.getSpawn();
  
          worldloadlistener.a(new ChunkCoordIntPair(blockposition));
-@@ -385,11 +547,13 @@
+@@ -385,10 +547,12 @@
  
          this.nextTick += 100L;
          this.sleepForTick();
@@ -359,14 +359,12 @@
  
 -        while (iterator.hasNext()) {
 -            DimensionManager dimensionmanager = (DimensionManager) iterator.next();
--            ForcedChunk forcedchunk = (ForcedChunk) this.getWorldServer(dimensionmanager).getWorldPersistentData().b(ForcedChunk::new, "chunks");
 +        if (true) {
 +            DimensionManager dimensionmanager = worldserver.worldProvider.getDimensionManager();
 +            // CraftBukkit end
-+            ForcedChunk forcedchunk = (ForcedChunk) worldserver.getWorldPersistentData().b(ForcedChunk::new, "chunks");
+             ForcedChunk forcedchunk = (ForcedChunk) this.getWorldServer(dimensionmanager).getWorldPersistentData().b(ForcedChunk::new, "chunks");
  
              if (forcedchunk != null) {
-                 WorldServer worldserver1 = this.getWorldServer(dimensionmanager);
 @@ -408,6 +572,8 @@
          this.sleepForTick();
          worldloadlistener.b();