From 1a997219b4d9e35cf5f73e2610266d248a1d05e3 Mon Sep 17 00:00:00 2001 From: Christian Weeks Date: Sun, 15 Apr 2012 11:29:54 -0400 Subject: [PATCH] Update fml to build 68: fixes a ticking issue and soft vs hard dependencies --- ...-src-1.0.0.65.zip => fml-src-1.0.0.68.zip} | Bin 65786 -> 65953 bytes .../server/MinecraftServer.java.patch | 15 +++++++-------- 2 files changed, 7 insertions(+), 8 deletions(-) rename forge/{fml-src-1.0.0.65.zip => fml-src-1.0.0.68.zip} (77%) 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 e05ff40f0cf95a08827a0221192ffb2cb1d8c622..eb9d33f1bfa7a849ca10be602b1b101429e2832f 100644 GIT binary patch delta 12014 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 v0w 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 delta 11763 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 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) {