diff --git a/nms-patches/MinecraftServer.patch b/nms-patches/MinecraftServer.patch
index 9bee63676b..411fdad525 100644
--- a/nms-patches/MinecraftServer.patch
+++ b/nms-patches/MinecraftServer.patch
@@ -15,6 +15,15 @@
  
  public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStatistics, ICommandListener, Runnable {
  
+@@ -70,7 +78,7 @@
+     public final DataFixer dataConverterManager;
+     private String serverIp;
+     private int q = -1;
+-    public final Map<DimensionManager, WorldServer> worldServer = Maps.newIdentityHashMap();
++    public final Map<DimensionManager, WorldServer> worldServer = Maps.newLinkedHashMap(); // CraftBukkit - keep order, k+v already use identity methods
+     private PlayerList playerList;
+     private boolean isRunning = true;
+     private boolean isStopped;
 @@ -124,7 +132,21 @@
      private boolean forceUpgrade;
      private float ap;