More patches

By: md_5 <md_5@live.com.au>

CraftBukkit-Patches/0025-Netty.patch

@@ -1,4 +1,4 @@
-From bfb9a7a900a658c78665a0397cd79789ad535056 Mon Sep 17 00:00:00 2001
+From 3a9c5ddf9b383449f2de17e827cccf88fe430f7d Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 23 Apr 2013 11:47:32 +1000
 Subject: [PATCH] Netty
@@ -210,7 +210,7 @@ index 17cfacc..a945892 100644
              this.b = true;
          } catch (Exception exception) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6cb50b7..20ba4b7 100644
+index 00326c1..c18e5e3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1366,4 +1366,20 @@ public final class CraftServer implements Server {
@@ -377,22 +377,22 @@ index 0000000..386c2f8
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 2fe3a5d..90d3193 100644
+index 6e8bae8..5686c41 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
-@@ -6,6 +6,11 @@ import java.io.IOException;
+@@ -6,7 +6,11 @@ import java.io.IOException;
  import java.lang.reflect.InvocationTargetException;
  import java.lang.reflect.Method;
  import java.lang.reflect.Modifier;
 +import java.util.ArrayList;
 +import java.util.Collections;
 +import java.util.HashMap;
-+import java.util.List;
+ import java.util.List;
 +import java.util.Map;
  import java.util.logging.Level;
  import org.bukkit.Bukkit;
  import org.bukkit.configuration.file.YamlConfiguration;
-@@ -130,4 +135,44 @@ public class SpigotConfig
+@@ -125,4 +129,44 @@ public class SpigotConfig
          restartScript = getString( "settings.restart-script", restartScript );
          WatchdogThread.doStart( timeoutTime, restartOnCrash );
      }