From d191b1171b790e2a14307f13307951409c2714d6 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 27 Feb 2013 16:51:57 +1100 Subject: [PATCH] Bump netty version. Why they so no pull my PR yet? --- CraftBukkit-Patches/0029-Netty.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CraftBukkit-Patches/0029-Netty.patch b/CraftBukkit-Patches/0029-Netty.patch index 0b4fa27e6..752874ca4 100644 --- a/CraftBukkit-Patches/0029-Netty.patch +++ b/CraftBukkit-Patches/0029-Netty.patch @@ -1,4 +1,4 @@ -From ef6504ec0d62667ac417c746cb1c7616359c05a8 Mon Sep 17 00:00:00 2001 +From a6b6583baf41c2a3043bae060eca88e7f6faf22d Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 14 Feb 2013 17:32:20 +1100 Subject: [PATCH] Netty @@ -60,7 +60,7 @@ Subject: [PATCH] Netty create mode 100644 src/main/java/org/spigotmc/netty/ReadState.java diff --git a/pom.xml b/pom.xml -index f17bd19..6b314ec 100644 +index f17bd19..8efab09 100644 --- a/pom.xml +++ b/pom.xml @@ -132,6 +132,11 @@ @@ -70,7 +70,7 @@ index f17bd19..6b314ec 100644 + + io.netty + netty-all -+ 4.0.0.Beta1 ++ 4.0.0.Beta2 + @@ -543,7 +543,7 @@ index 0000000..6cb1b98 +} diff --git a/src/main/java/org/spigotmc/netty/NettyServerConnection.java b/src/main/java/org/spigotmc/netty/NettyServerConnection.java new file mode 100644 -index 0000000..1656ff0 +index 0000000..84c58ff --- /dev/null +++ b/src/main/java/org/spigotmc/netty/NettyServerConnection.java @@ -0,0 +1,110 @@ @@ -587,7 +587,7 @@ index 0000000..1656ff0 + + public NettyServerConnection(MinecraftServer ms, InetAddress host, int port) { + super(ms); -+ int threads = Integer.getInteger("org.spigotmc.netty.threads",3); ++ int threads = Integer.getInteger("org.spigotmc.netty.threads", 3); + socket = new ServerBootstrap().channel(NioServerSocketChannel.class).childHandler(new ChannelInitializer() { + @Override + public void initChannel(Channel ch) throws Exception {