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

Bump netty version. Why they so no pull my PR yet?

This commit is contained in:
md_5 2013-02-27 16:51:57 +11:00
parent e8de702f14
commit d191b1171b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CraftBukkit-Patches/0029-Netty.patch
View File

@ -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 <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
@ -60,7 +60,7 @@ Subject: [PATCH] Netty
create mode 100644 src/main/java/org/spigotmc/netty/ReadState.java create mode 100644 src/main/java/org/spigotmc/netty/ReadState.java
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index f17bd19..6b314ec 100644 index f17bd19..8efab09 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -132,6 +132,11 @@ @@ -132,6 +132,11 @@
@ -70,7 +70,7 @@ index f17bd19..6b314ec 100644
+ <dependency> + <dependency>
+ <groupId>io.netty</groupId> + <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId> + <artifactId>netty-all</artifactId>
+ <version>4.0.0.Beta1</version> + <version>4.0.0.Beta2</version>
+ </dependency> + </dependency>
</dependencies> </dependencies>
@ -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 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..1656ff0 index 0000000..84c58ff
--- /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,110 @@ @@ -0,0 +1,110 @@
@ -587,7 +587,7 @@ index 0000000..1656ff0
+ +
+ public NettyServerConnection(MinecraftServer ms, InetAddress host, int port) { + public NettyServerConnection(MinecraftServer ms, InetAddress host, int port) {
+ super(ms); + 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() { + socket = new ServerBootstrap().channel(NioServerSocketChannel.class).childHandler(new ChannelInitializer() {
+ @Override + @Override
+ public void initChannel(Channel ch) throws Exception { + public void initChannel(Channel ch) throws Exception {