dont sleep moments, yep, change include in common patch

Bogdan-G · Feb 16, 2016 · 63c298b · 63c298b
1 parent 0efffa8
commit 63c298b
Show file tree

Hide file tree

Showing 3 changed files with 32,860 additions and 14 deletions.
diff --git a/build.gradle b/build.gradle
@@ -51,8 +51,8 @@ ext.buildInfoCached = null;
 def buildInfo(String key) {
     if (!buildInfoCached) {
             buildInfoCached = [
-                    nextBuildNumber: 'test32',
-                    version        : 'test31'
+                    nextBuildNumber: 'test33',
+                    version        : 'test32'
             ]
     }
     return key ? buildInfoCached[key] : buildInfoCached;
@@ -81,7 +81,7 @@ def gitInfo(String key) {
     return key ? gitInfoCached[key] : gitInfoCached;
 }
 
-version = "1.7.10-0.test32"
+version = "1.7.10-0.test33"
 
 launch4j {
     jreMinVersion = '1.6.0'

diff --git a/eclipse-patch/patch.patch b/eclipse-patch/patch.patch
@@ -3648,7 +3648,7 @@ index 8c5e859..c18927d 100644
                      }
                      else if (block == this)
 diff --git ./eclipse/Clean/src/main/java/net/minecraft/client/Minecraft.java ./eclipse/cauldron/src/main/java/net/minecraft/client/Minecraft.java
-index b1e33ee..beb7a5e 100644
+index b1e33ee..86c9d25 100644
 --- ./eclipse/Clean/src/main/java/net/minecraft/client/Minecraft.java
 +++ ./eclipse/cauldron/src/main/java/net/minecraft/client/Minecraft.java
 @@ -148,6 +148,7 @@ import net.minecraft.util.Session;
@@ -3659,6 +3659,24 @@ index b1e33ee..beb7a5e 100644
  import net.minecraft.world.WorldProviderEnd;
  import net.minecraft.world.WorldProviderHell;
  import net.minecraft.world.WorldSettings;
+@@ -319,7 +320,7 @@ public class Minecraft implements IPlayerUsage
+             private static final String __OBFID = "CL_00000632";
+             public void run()
+             {
+-                while (Minecraft.this.running)
++                /*while (Minecraft.this.running) // FFoKC - off sleep
+                 {
+                     try
+                     {
+@@ -329,7 +330,7 @@ public class Minecraft implements IPlayerUsage
+                     {
+                         ;
+                     }
+-                }
++                }*/
+             }
+         };
+         thread.setDaemon(true);
 @@ -2655,7 +2656,14 @@ public class Minecraft implements IPlayerUsage
 
              if (integratedserver != null)
@@ -18349,7 +18367,7 @@ index 4bf8cee..d3542e4 100644
  }
 \ No newline at end of file
 diff --git ./eclipse/Clean/src/main/java/net/minecraft/server/MinecraftServer.java ./eclipse/cauldron/src/main/java/net/minecraft/server/MinecraftServer.java
-index c23c8fa..7028d50 100644
+index c23c8fa..9a3d8da 100644
 --- ./eclipse/Clean/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ ./eclipse/cauldron/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -33,7 +34,10 @@ import java.util.List;
@@ -18809,7 +18827,7 @@ index c23c8fa..7028d50 100644
 -                        logger.warn("Can\'t keep up! Did the system time change, or is the server overloaded? Running {}ms behind, skipping {} tick(s)", new Object[] {Long.valueOf(k), Long.valueOf(k / 50L)});
 -                        k = 2000L;
 -                        this.timeOfLastWarning = i;
-+                        Thread.sleep(wait / 1000000);
++                        //Thread.sleep(wait / 1000000); // FFoKC - dont Thread sleep
 +                        catchupTime = 0;
 +                        continue;
                      }
@@ -19557,7 +19575,7 @@ index fa9629c..1dbb640 100644
          boolean flag = false;
 
 diff --git ./eclipse/Clean/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java ./eclipse/cauldron/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 7526a8d..13c4f3d 100644
+index 7526a8d..ac078a6 100644
 --- ./eclipse/Clean/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ ./eclipse/cauldron/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -34,9 +34,19 @@ import net.minecraft.world.EnumDifficulty;
@@ -19606,7 +19624,22 @@ index 7526a8d..13c4f3d 100644
          {
              private static final String __OBFID = "CL_00001787";
              {
-@@ -82,31 +95,77 @@ public class DedicatedServer extends MinecraftServer implements IServer
+@@ -64,7 +77,7 @@ public class DedicatedServer extends MinecraftServer implements IServer
+             }
+             public void run()
+             {
+-                while (true)
++                /*while (true) // FFoKC - off sleep
+                 {
+                     try
+                     {
+@@ -77,36 +90,82 @@ public class DedicatedServer extends MinecraftServer implements IServer
+                     {
+                         ;
+                     }
+-                }
++                }*/
+             }
          };
      }
 
@@ -19733,15 +19766,15 @@ index 7526a8d..13c4f3d 100644
 
 -            if (this.func_152368_aE())
 +            try
-             {
--                this.func_152358_ax().func_152658_c();
++            {
 +                if (this.func_152368_aE())
 +                {
 +                    this.func_152358_ax().func_152658_c();
 +                }
 +            }
 +            catch (IOException e)
-+            {
+             {
+-                this.func_152358_ax().func_152658_c();
 +                e.printStackTrace();
              }
 
@@ -19809,6 +19842,23 @@ index 7526a8d..13c4f3d 100644
      }
 
      public boolean isDedicatedServer()
+@@ -561,13 +666,13 @@ public class DedicatedServer extends MinecraftServer implements IServer
+
+     private void func_152369_aG()
+     {
+-        try
++        /*try // FFoKC - off sleep
+         {
+             Thread.sleep(5000L);
+         }
+         catch (InterruptedException interruptedexception)
+         {
+             ;
+-        }
++        }*/
+     }
+ }
+\ No newline at end of file
 diff --git ./eclipse/Clean/src/main/java/net/minecraft/server/dedicated/PropertyManager.java ./eclipse/cauldron/src/main/java/net/minecraft/server/dedicated/PropertyManager.java
 index ec7735a..a436d79 100644
 --- ./eclipse/Clean/src/main/java/net/minecraft/server/dedicated/PropertyManager.java
@@ -19909,6 +19959,28 @@ index ec7735a..a436d79 100644
          }
      }
 
+diff --git ./eclipse/Clean/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java ./eclipse/cauldron/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
+index 3b9f4d0..5aa8b51 100644
+--- ./eclipse/Clean/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
++++ ./eclipse/cauldron/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
+@@ -65,7 +65,7 @@ public class MinecraftServerGui extends JComponent
+             {
+                 p_120016_0_.initiateShutdown();
+
+-                while (!p_120016_0_.isServerStopped())
++                /*while (!p_120016_0_.isServerStopped()) // FFoKC - off sleep
+                 {
+                     try
+                     {
+@@ -75,7 +75,7 @@ public class MinecraftServerGui extends JComponent
+                     {
+                         interruptedexception.printStackTrace();
+                     }
+-                }
++                }*/
+
+                 System.exit(0);
+             }
 diff --git ./eclipse/Clean/src/main/java/net/minecraft/server/integrated/IntegratedServer.java ./eclipse/cauldron/src/main/java/net/minecraft/server/integrated/IntegratedServer.java
 index 9be9989..0df8624 100644
 --- ./eclipse/Clean/src/main/java/net/minecraft/server/integrated/IntegratedServer.java
@@ -28650,6 +28722,28 @@ index 1b0ea95..502b782 100644
                      boolean flag = !p_76204_1_.isOnItemFrame();
 
                      if (this.lastPlayerLocationOnMap != null && this.lastPlayerLocationOnMap.length == abyte.length)
+diff --git ./eclipse/Clean/src/main/java/net/minecraft/world/storage/SaveFormatOld.java ./eclipse/cauldron/src/main/java/net/minecraft/world/storage/SaveFormatOld.java
+index d922e1c..dcc31c2 100644
+--- ./eclipse/Clean/src/main/java/net/minecraft/world/storage/SaveFormatOld.java
++++ ./eclipse/cauldron/src/main/java/net/minecraft/world/storage/SaveFormatOld.java
+@@ -179,7 +179,7 @@ public class SaveFormatOld implements ISaveFormat
+
+                 logger.warn("Unsuccessful in deleting contents.");
+
+-                if (i < 5)
++                /*if (i < 5) // FFoKC - off sleep
+                 {
+                     try
+                     {
+@@ -189,7 +189,7 @@ public class SaveFormatOld implements ISaveFormat
+                     {
+                         ;
+                     }
+-                }
++                }*/
+             }
+
+             return file1.delete();
 diff --git ./eclipse/Clean/src/main/java/net/minecraft/world/storage/SaveHandler.java ./eclipse/cauldron/src/main/java/net/minecraft/world/storage/SaveHandler.java
 index 4bed2ec..8f15bd3 100644
 --- ./eclipse/Clean/src/main/java/net/minecraft/world/storage/SaveHandler.java
@@ -28907,10 +29001,10 @@ index 2ab6ad6..f458a25 100644
  }
 \ No newline at end of file
 diff --git ./eclipse/Clean/src/main/java/net/minecraft/world/storage/ThreadedFileIOBase.java ./eclipse/cauldron/src/main/java/net/minecraft/world/storage/ThreadedFileIOBase.java
-index ceea349..042f286 100644
+index ceea349..d5628b8 100644
 --- ./eclipse/Clean/src/main/java/net/minecraft/world/storage/ThreadedFileIOBase.java
 +++ ./eclipse/cauldron/src/main/java/net/minecraft/world/storage/ThreadedFileIOBase.java
-@@ -39,14 +39,14 @@ public class ThreadedFileIOBase implements Runnable
+@@ -39,17 +39,17 @@ public class ThreadedFileIOBase implements Runnable
                  ++this.savedIOCounter;
              }
 
@@ -28926,7 +29020,20 @@ index ceea349..042f286 100644
 +            }*/ // KCauldron end
          }
 
-         if (this.threadedIOQueue.isEmpty())
+-        if (this.threadedIOQueue.isEmpty())
++        /*if (this.threadedIOQueue.isEmpty()) // FFoKC - off sleep
+         {
+             try
+             {
+@@ -59,7 +59,7 @@ public class ThreadedFileIOBase implements Runnable
+             {
+                 interruptedexception.printStackTrace();
+             }
+-        }
++        }*/
+     }
+
+     public void queueIO(IThreadedFileIO p_75735_1_)
 diff --git ./eclipse/Clean/src/main/java/net/minecraft/world/storage/WorldInfo.java ./eclipse/cauldron/src/main/java/net/minecraft/world/storage/WorldInfo.java
 index 5951732..40d8c2d 100644
 --- ./eclipse/Clean/src/main/java/net/minecraft/world/storage/WorldInfo.java