Add thread naes to their own patch.

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

CraftBukkit-Patches/0020-Netty.patch

@@ -1,6 +1,6 @@
-From 37052de31a36a7565122c58b9fe743dc2a046e45 Mon Sep 17 00:00:00 2001
+From f29d525666c67bdc26e351f7dbd17d55a742676f Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
-Date: Fri, 19 Apr 2013 17:44:39 +1000
+Date: Tue, 23 Apr 2013 11:47:32 +1000
 Subject: [PATCH] Netty
 
  Implement an uber efficient network engine based on the
@@ -48,18 +48,9 @@ index 3e02cc3..f2b6e35 100644
  
    <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index bd7e41c..93cd0a9 100644
+index bd7e41c..b04d8a1 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
-@@ -34,7 +34,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
-         super(options);
-         // CraftBukkit end
-         this.l = new ConsoleLogManager("Minecraft-Server", (String) null, (String) null); // CraftBukkit - null last argument
--        new ThreadSleepForever(this);
-+        // new ThreadSleepForever(this); // Spigot
-     }
- 
-     protected boolean init() throws java.net.UnknownHostException { // CraftBukkit - throws UnknownHostException
 @@ -91,10 +91,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
  
          this.getLogger().info("Generating keypair");
@@ -148,7 +139,7 @@ index 84dbb88..617b474 100644
          this.d = chunkmap.c;
          this.c = chunkmap.b;
 diff --git a/src/main/java/net/minecraft/server/Packet56MapChunkBulk.java b/src/main/java/net/minecraft/server/Packet56MapChunkBulk.java
-index 9f8afe3..b1d3a17 100644
+index 9f8afe3..a89c9c9 100644
 --- a/src/main/java/net/minecraft/server/Packet56MapChunkBulk.java
 +++ b/src/main/java/net/minecraft/server/Packet56MapChunkBulk.java
 @@ -24,7 +24,7 @@ public class Packet56MapChunkBulk extends Packet {
@@ -156,7 +147,7 @@ index 9f8afe3..b1d3a17 100644
          protected Deflater initialValue() {
              // Don't use higher compression level, slows things down too much
 -            return new Deflater(6);
-+            return new Deflater(4);
++            return new Deflater(4); // Spigot - use lower compression level still
          }
      };
      // CraftBukkit end
@@ -213,43 +204,11 @@ index eb474f5..836ad94 100644
  
              this.b = true;
          } catch (Exception exception) {
-diff --git a/src/main/java/net/minecraft/server/ThreadCommandReader.java b/src/main/java/net/minecraft/server/ThreadCommandReader.java
-index 489e184..9533b6f 100644
---- a/src/main/java/net/minecraft/server/ThreadCommandReader.java
-+++ b/src/main/java/net/minecraft/server/ThreadCommandReader.java
-@@ -11,6 +11,7 @@ class ThreadCommandReader extends Thread {
-     final DedicatedServer server;
- 
-     ThreadCommandReader(DedicatedServer dedicatedserver) {
-+        super("Command Reader Thread"); // Spigot
-         this.server = dedicatedserver;
-     }
- 
-diff --git a/src/main/java/net/minecraft/server/ThreadLoginVerifier.java b/src/main/java/net/minecraft/server/ThreadLoginVerifier.java
-index 9ed3db5..a2a4458 100644
---- a/src/main/java/net/minecraft/server/ThreadLoginVerifier.java
-+++ b/src/main/java/net/minecraft/server/ThreadLoginVerifier.java
-@@ -21,6 +21,7 @@ class ThreadLoginVerifier extends Thread {
-     CraftServer server;
- 
-     ThreadLoginVerifier(PendingConnection pendingconnection, CraftServer server) {
-+        super("Login Verifier Thread");
-         this.server = server;
-         // CraftBukkit end
-         this.pendingConnection = pendingconnection;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 20d38b4..a85d0c8 100644
+index 20d38b4..f7ec7bb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -129,6 +129,7 @@ import com.avaje.ebean.config.dbplatform.SQLitePlatform;
- import com.avaje.ebeaninternal.server.lib.sql.TransactionIsolation;
- import com.google.common.collect.ImmutableList;
- import com.google.common.collect.MapMaker;
-+import java.net.InetSocketAddress;
- 
- import jline.console.ConsoleReader;
- 
-@@ -1372,4 +1373,20 @@ public final class CraftServer implements Server {
+@@ -1372,4 +1372,20 @@ public final class CraftServer implements Server {
      public CraftScoreboardManager getScoreboardManager() {
          return scoreboardManager;
      }
@@ -263,26 +222,13 @@ index 20d38b4..a85d0c8 100644
 +            for (Object o : listeners) {
 +
 +                Map<String, Object> sect = (Map<String, Object>) o;
-+                ret.add(new InetSocketAddress((String) sect.get("address"), (Integer) sect.get("port")));
++                ret.add(new java.net.InetSocketAddress((String) sect.get("address"), (Integer) sect.get("port")));
 +            }
 +        }
 +        return ret;
 +    }
 +    // Spigot end
  }
-diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 84dcfcc..a30f217 100644
---- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-@@ -71,7 +71,7 @@ public class CraftScheduler implements BukkitScheduler {
-      */
-     private final ConcurrentHashMap<Integer, CraftTask> runners = new ConcurrentHashMap<Integer, CraftTask>();
-     private volatile int currentTick = -1;
--    private final Executor executor = Executors.newCachedThreadPool();
-+    private final Executor executor = Executors.newCachedThreadPool(new com.google.common.util.concurrent.ThreadFactoryBuilder().setNameFormat("Craft Scheduler Thread - %1$d").build()); // Spigot
-     private CraftAsyncDebugger debugHead = new CraftAsyncDebugger(-1, null, null) {@Override StringBuilder debugTo(StringBuilder string) {return string;}};
-     private CraftAsyncDebugger debugTail = debugHead;
-     private static final int RECENT_TICKS;
 diff --git a/src/main/java/org/spigotmc/MultiplexingServerConnection.java b/src/main/java/org/spigotmc/MultiplexingServerConnection.java
 new file mode 100644
 index 0000000..c8ea80a
@@ -1352,14 +1298,13 @@ index 0000000..5dc3754
 +    DATA;
 +}
 diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml
-index 7a6c12f..558a3e2 100644
+index 7a6c12f..1a57fdd 100644
 --- a/src/main/resources/configurations/bukkit.yml
 +++ b/src/main/resources/configurations/bukkit.yml
-@@ -12,7 +12,9 @@
- # Twitter: http://twitter.com/Craftbukkit
+@@ -13,6 +13,9 @@
  # Bug tracker: http://leaky.bukkit.org/
  
--
+ 
 +#listeners:
 +#  - address: 127.0.0.1
 +#    port: 25577