diff --git a/forge/fml-src-2.2.22.121.zip b/forge/fml-src-2.2.40.130.zip similarity index 52% rename from forge/fml-src-2.2.22.121.zip rename to forge/fml-src-2.2.40.130.zip index 3b24d62c58..08bbd0aebd 100644 Binary files a/forge/fml-src-2.2.22.121.zip and b/forge/fml-src-2.2.40.130.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 8fa3738a05..c247a8276e 100644 --- a/forge/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch @@ -8,7 +8,7 @@ import java.util.Iterator; import java.util.List; import java.util.Random; -@@ -44,11 +45,13 @@ +@@ -45,11 +46,13 @@ import net.minecraft.src.ThreadServerApplication; import net.minecraft.src.ThreadServerSleep; import net.minecraft.src.Vec3D; @@ -22,7 +22,7 @@ public class MinecraftServer implements Runnable, ICommandListener, IServer { -@@ -69,9 +72,10 @@ +@@ -70,9 +73,10 @@ public PropertyManager propertyManagerObj; /** The server world manager. */ @@ -35,7 +35,7 @@ /** the server config manager for this server */ public ServerConfigurationManager configManager; -@@ -99,7 +103,7 @@ +@@ -100,7 +104,7 @@ /** A list containing all the commands entered. */ private List commands = Collections.synchronizedList(new ArrayList()); @@ -44,7 +44,7 @@ /** True if the server is in online mode. */ public boolean onlineMode; -@@ -129,6 +133,8 @@ +@@ -130,6 +134,8 @@ public long[] field_48082_x = new long[100]; private RConThreadQuery rconQueryThread; private RConThreadMain rconMainThread; @@ -53,7 +53,7 @@ public MinecraftServer() { -@@ -163,6 +169,7 @@ +@@ -164,6 +170,7 @@ this.allowFlight = this.propertyManagerObj.getBooleanProperty("allow-flight", false); this.motd = this.propertyManagerObj.getStringProperty("motd", "A Minecraft Server"); this.motd.replace('\u00a7', '$'); @@ -61,7 +61,7 @@ InetAddress var2 = null; if (this.hostname.length() > 0) -@@ -195,9 +202,11 @@ +@@ -196,9 +203,11 @@ FMLServerHandler.instance().onLoadComplete(); this.configManager = new ServerConfigurationManager(this); @@ -73,7 +73,7 @@ long var3 = System.nanoTime(); String var5 = this.propertyManagerObj.getStringProperty("level-name", "world"); String var6 = this.propertyManagerObj.getStringProperty("level-seed", ""); -@@ -265,53 +274,36 @@ +@@ -266,53 +275,36 @@ logger.info("Converting map!"); par1ISaveFormat.convertMapFormat(par2Str, new ConvertProgressUpdater(this)); } @@ -143,7 +143,7 @@ ChunkCoordinates var15 = var14.getSpawnPoint(); for (int var16 = -var22; var16 <= var22 && this.serverRunning; var16 += 16) -@@ -372,9 +364,9 @@ +@@ -373,9 +365,9 @@ { logger.info("Saving chunks"); @@ -155,7 +155,7 @@ var2.saveWorld(true, (IProgressUpdate)null); var2.func_30006_w(); } -@@ -392,13 +384,14 @@ +@@ -393,13 +385,14 @@ this.configManager.savePlayerStates(); } @@ -172,7 +172,7 @@ } } } -@@ -440,7 +433,7 @@ +@@ -442,7 +435,7 @@ var3 += var7; var1 = var5; @@ -181,7 +181,7 @@ { this.doTick(); var3 = 0L; -@@ -542,13 +535,13 @@ +@@ -544,13 +537,13 @@ Vec3D.initialize(); ++this.deathTime; @@ -198,7 +198,7 @@ if (this.deathTime % 20 == 0) { -@@ -567,15 +560,15 @@ +@@ -571,15 +564,15 @@ } } @@ -217,7 +217,7 @@ } for (var9 = 0; var9 < this.playersOnline.size(); ++var9) -@@ -689,7 +682,8 @@ +@@ -694,7 +687,8 @@ */ public WorldServer getWorldManager(int par1) { @@ -227,7 +227,7 @@ } /** -@@ -697,7 +691,7 @@ +@@ -702,7 +696,7 @@ */ public EntityTracker getEntityTracker(int par1) { @@ -236,7 +236,7 @@ } /** -@@ -867,7 +861,7 @@ +@@ -872,7 +866,7 @@ */ public String getServerBrand() {