core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix NPE on start

This commit is contained in:
md_5 2013-02-24 12:19:34 +11:00
parent 7baf714b5d
commit d95c162605
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CraftBukkit-Patches/0030-Netty.patch
View File

@ -1,4 +1,4 @@
From a71fdc50b01a0ebf977007cb47f0d4a839d2f76d Mon Sep 17 00:00:00 2001 From 172038b7a42efce24c5f98e126fae460d9085d58 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Thu, 14 Feb 2013 17:32:20 +1100 Date: Thu, 14 Feb 2013 17:32:20 +1100
Subject: [PATCH] Netty Subject: [PATCH] Netty
@ -568,7 +568,7 @@ index 0000000..fe978fe
+} +}
diff --git a/src/main/java/org/spigotmc/netty/NettyServerConnection.java b/src/main/java/org/spigotmc/netty/NettyServerConnection.java diff --git a/src/main/java/org/spigotmc/netty/NettyServerConnection.java b/src/main/java/org/spigotmc/netty/NettyServerConnection.java
new file mode 100644 new file mode 100644
index 0000000..e388dbf index 0000000..da8c95e
--- /dev/null --- /dev/null
+++ b/src/main/java/org/spigotmc/netty/NettyServerConnection.java +++ b/src/main/java/org/spigotmc/netty/NettyServerConnection.java
@@ -0,0 +1,108 @@ @@ -0,0 +1,108 @@
@ -630,7 +630,7 @@ index 0000000..e388dbf
+ .addLast("manager", new NettyNetworkManager()); + .addLast("manager", new NettyNetworkManager());
+ } + }
+ }).group(new NioEventLoopGroup(Spigot.nettyThreads, new ThreadFactoryBuilder().setNameFormat("Netty IO Thread - %1$d").build())).localAddress(host, port).bind(); + }).group(new NioEventLoopGroup(Spigot.nettyThreads, new ThreadFactoryBuilder().setNameFormat("Netty IO Thread - %1$d").build())).localAddress(host, port).bind();
+ Bukkit.getServer().getLogger().info("Using Netty NIO with {0} threads for network connections."); + MinecraftServer.log.info("Using Netty NIO with {0} threads for network connections.");
+ } + }
+ +
+ /** + /**