diff --git a/Spigot-Server-Patches/Optimize-Server-World-Map.patch b/Spigot-Server-Patches/Optimize-Server-World-Map.patch
index 4e794e3cd2e..894fa75f5de 100644
--- a/Spigot-Server-Patches/Optimize-Server-World-Map.patch
+++ b/Spigot-Server-Patches/Optimize-Server-World-Map.patch
@@ -217,7 +217,7 @@ index 0000000000..af9e4455c6
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index fb62320310..2912e9ec68 100644
+index fb62320310..98d182fdb8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -229,4 +229,13 @@ index fb62320310..2912e9ec68 100644
      private PlayerList s;
      private boolean isRunning = true;
      private boolean isRestarting = false; // Paper - flag to signify we're attempting to restart
+@@ -0,0 +0,0 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
+             }
+         }
+ 
+-        for (WorldServer world : this.getWorlds()) {
++        for (WorldServer world : com.google.common.collect.Lists.newArrayList(this.getWorlds())) { // Paper - avoid como if 1 world triggers another world
+             this.server.getPluginManager().callEvent(new org.bukkit.event.world.WorldLoadEvent(world.getWorld()));
+         }
+         // CraftBukkit end
 --
\ No newline at end of file