diff --git a/forge/fml-src-1.0.0.65.zip b/forge/fml-src-1.0.0.68.zip similarity index 77% rename from forge/fml-src-1.0.0.65.zip rename to forge/fml-src-1.0.0.68.zip index e05ff40f0..eb9d33f1b 100644 Binary files a/forge/fml-src-1.0.0.65.zip and b/forge/fml-src-1.0.0.68.zip differ diff --git a/forge/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch b/forge/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch index 7433f8a63..820a26028 100644 --- a/forge/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch @@ -90,7 +90,10 @@ AnvilSaveHandler var9 = new AnvilSaveHandler(new File("."), par2Str, true); - - for (int var10 = 0; var10 < this.worldMngr.length; ++var10) -- { ++ ++ WorldServer overWorld = new WorldServer(this, var9, par2Str, 0, var8); ++ for (Integer id : DimensionManager.getIDs()) + { - byte var11 = 0; - - if (var10 == 1) @@ -117,10 +120,6 @@ - this.worldMngr[var10].setAllowedSpawnTypes(this.propertyManagerObj.getBooleanProperty("spawn-monsters", true), this.spawnPeacefulMobs); - this.worldMngr[var10].getWorldInfo().setGameType(var6); - this.configManager.setPlayerManager(this.worldMngr); -+ -+ WorldServer overWorld = new WorldServer(this, var9, par2Str, 0, var8); -+ for (Integer id : DimensionManager.getIDs()) -+ { + WorldServer world = (id == 0 ? overWorld : new WorldServerMulti(this, var9, par2Str, id, var8, overWorld)); + world.addWorldAccess(new WorldManager(this, world)); + world.difficultySetting = propertyManagerObj.getIntProperty("difficulty", 1); @@ -172,7 +171,7 @@ } } } -@@ -440,7 +433,7 @@ +@@ -439,7 +432,7 @@ var3 += var7; var1 = var5; @@ -217,7 +216,7 @@ } for (var9 = 0; var9 < this.playersOnline.size(); ++var9) -@@ -689,7 +682,8 @@ +@@ -691,7 +684,8 @@ */ public WorldServer getWorldManager(int par1) { @@ -227,7 +226,7 @@ } /** -@@ -697,7 +691,7 @@ +@@ -699,7 +693,7 @@ */ public EntityTracker getEntityTracker(int par1) {