ForgePatch/fml/conf/patches/minecraft_server_ff.patch

diff -r -U 3 minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java
--- minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java	Tue Sep 17 14:00:13 2013
+++ minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java	Tue Sep 17 14:01:07 2013
@@ -21,9 +21,14 @@
 
    public String func_85085_a() throws SecurityException, NoSuchFieldException, IllegalAccessException, IllegalArgumentException {
       StringBuilder var1 = new StringBuilder();
+     ArrayList var3;
+     try {
       Field var2 = ClassLoader.class.getDeclaredField("classes");
       var2.setAccessible(true);
-      ArrayList var3 = new ArrayList((Vector)var2.get(CrashReport.class.getClassLoader()));
+      var3 = new ArrayList((Vector)var2.get(CrashReport.class.getClassLoader()));
+     } catch(Exception ex) {
+      return "";
+     }
       boolean var4 = true;
       boolean var5 = !CrashReport.class.getCanonicalName().equals("net.minecraft.CrashReport");
       HashMap var6 = new HashMap();
@@ -98,6 +103,10 @@
 
    // $FF: synthetic method
    public Object call() {
-      return this.func_85085_a();
+     try {
+       return this.func_85085_a();
+     } catch(Exception ex) {
+       return null;
+     }
    }
 }
diff -r -U 3 minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java
--- minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java	Tue Sep 17 14:00:14 2013
+++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Tue Sep 17 14:01:07 2013
@@ -11,6 +11,10 @@
 
 public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
 
+   public ComponentStrongholdRightTurn(int p_i2074_1_, Random p_i2074_2_, StructureBoundingBox p_i2074_3_, int p_i2074_4_) {
+      super(p_i2074_1_, p_i2074_2_, p_i2074_3_, p_i2074_4_);
+   }
+
    public void func_74861_a(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_) {
       if(this.field_74885_f != 2 && this.field_74885_f != 3) {
          this.func_74989_b((ComponentStrongholdStairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
diff -r -U 3 minecraft_server\net\minecraft\src\DedicatedServer.java minecraft_server_patched\net\minecraft\src\DedicatedServer.java
--- minecraft_server\net\minecraft\src\DedicatedServer.java	Tue Sep 17 14:00:14 2013
+++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java	Tue Sep 17 14:01:07 2013
@@ -209,7 +209,7 @@
       System.exit(0);
    }
 
-   protected void func_71190_q() {
+   public void func_71190_q() {
       super.func_71190_q();
       this.func_71333_ah();
    }
diff -r -U 3 minecraft_server\net\minecraft\src\EnumChatFormatting.java minecraft_server_patched\net\minecraft\src\EnumChatFormatting.java
--- minecraft_server\net\minecraft\src\EnumChatFormatting.java	Tue Sep 17 14:00:14 2013
+++ minecraft_server_patched\net\minecraft\src\EnumChatFormatting.java	Tue Sep 17 14:01:07 2013
@@ -38,7 +38,7 @@
    private final String field_96304_B;
 
    private EnumChatFormatting(char p_i1336_3_) {
-      this(p_i1336_1_, p_i1336_2_, p_i1336_3_, false);
+      this(p_i1336_3_, false);
    }
 
    private EnumChatFormatting(char p_i1337_3_, boolean p_i1337_4_) {
diff -r -U 3 minecraft_server\net\minecraft\src\MemoryConnection.java minecraft_server_patched\net\minecraft\src\MemoryConnection.java
--- minecraft_server\net\minecraft\src\MemoryConnection.java	Tue Sep 17 14:00:15 2013
+++ minecraft_server_patched\net\minecraft\src\MemoryConnection.java	Tue Sep 17 14:01:07 2013
@@ -11,13 +11,18 @@
 public class MemoryConnection implements INetworkManager {
 
    private static final SocketAddress field_74444_a = new InetSocketAddress("127.0.0.1", 0);
-   private final List field_74442_b;
+   private final List field_74442_b  = java.util.Collections.synchronizedList(new java.util.ArrayList());
    private final ILogAgent field_98214_c;
    private MemoryConnection field_74443_c;
    private NetHandler field_74440_d;
    private boolean field_74441_e;
    private String field_74438_f;
    private Object[] field_74439_g;
+
+   public MemoryConnection(ILogAgent p_i1392_1_, NetHandler p_i1392_2_) {
+      this.field_74440_d = p_i1392_2_;
+      this.field_98214_c = p_i1392_1_;
+   }
 
    public void func_74425_a(NetHandler p_74425_1_) {
       this.field_74440_d = p_74425_1_;
diff -r -U 3 minecraft_server\net\minecraft\src\RConThreadClient.java minecraft_server_patched\net\minecraft\src\RConThreadClient.java
--- minecraft_server\net\minecraft\src\RConThreadClient.java	Tue Sep 17 14:00:15 2013
+++ minecraft_server_patched\net\minecraft\src\RConThreadClient.java	Tue Sep 17 14:01:07 2013
@@ -32,8 +32,8 @@
    }
 
    public void run() {
-      while(true) {
-         try {
+      try {
+         while(true) {
             if(!this.field_72619_a) {
                break;
             }
@@ -84,20 +84,14 @@
                   continue;
                }
             }
-         } catch (SocketTimeoutException var17) {
-            break;
-         } catch (IOException var18) {
-            break;
-         } catch (Exception var19) {
-            System.out.println(var19);
-            break;
-         } finally {
-            this.func_72653_g();
          }
-
-         return;
+      } catch (SocketTimeoutException var17) {
+      } catch (IOException var18) {
+      } catch (Exception var19) {
+         System.out.println(var19);
+      } finally {
+         this.func_72653_g();
       }
-
    }
 
    private void func_72654_a(int p_72654_1_, int p_72654_2_, String p_72654_3_) throws IOException {
diff -r -U 3 minecraft_server\net\minecraft\src\TcpMasterThread.java minecraft_server_patched\net\minecraft\src\TcpMasterThread.java
--- minecraft_server\net\minecraft\src\TcpMasterThread.java	Tue Sep 17 14:00:16 2013
+++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java	Tue Sep 17 14:01:07 2013
@@ -11,6 +11,7 @@
       this.field_74504_a = p_i1395_1_;
    }
 
+   @SuppressWarnings("deprecation")
    public void run() {
       try {
          Thread.sleep(5000L);
diff -r -U 3 minecraft_server\net\minecraft\src\ThreadedFileIOBase.java minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java
--- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java	Tue Sep 17 14:00:16 2013
+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Tue Sep 17 14:01:07 2013
@@ -20,6 +20,7 @@
    }
 
    public void run() {
+     while(true)
       this.func_75736_b();
    }