mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to actually compile with netty beta

Browse source
This commit is contained in:
md_5 2013-02-17 20:15:48 +11:00
parent b92c8190a2
commit fb324452c2
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
CraftBukkit-Patches/0025-Netty.patch
View file

@ -1,4 +1,4 @@
From a9f7e64105fe0686c974a30ba49d0f19f868dfe4 Mon Sep 17 00:00:00 2001 From 29bb417ab7f2b19d07cbf9a31395346e3ac804ec 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
@ -132,7 +132,7 @@ index 8413a15..70fe839 100644
diff --git a/src/main/java/org/spigotmc/netty/CipherCodec.java b/src/main/java/org/spigotmc/netty/CipherCodec.java diff --git a/src/main/java/org/spigotmc/netty/CipherCodec.java b/src/main/java/org/spigotmc/netty/CipherCodec.java
new file mode 100644 new file mode 100644
index 0000000..cfc0535 index 0000000..f25af14
--- /dev/null --- /dev/null
+++ b/src/main/java/org/spigotmc/netty/CipherCodec.java +++ b/src/main/java/org/spigotmc/netty/CipherCodec.java
@@ -0,0 +1,65 @@ @@ -0,0 +1,65 @@
@ -184,7 +184,7 @@ index 0000000..cfc0535
+ public void freeOutboundBuffer(ChannelHandlerContext ctx) throws Exception { + public void freeOutboundBuffer(ChannelHandlerContext ctx) throws Exception {
+ super.freeOutboundBuffer(ctx); + super.freeOutboundBuffer(ctx);
+ if (heapOut != null) { + if (heapOut != null) {
+ heapOut.free(); + heapOut.release();
+ heapOut = null; + heapOut = null;
+ } + }
+ decrypt = null; + decrypt = null;
@ -415,7 +415,7 @@ index 0000000..027cc31
+} +}
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..edf4f85 index 0000000..cb1687c
--- /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,105 @@ @@ -0,0 +1,105 @@
@ -427,7 +427,7 @@ index 0000000..edf4f85
+import io.netty.channel.ChannelFuture; +import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelInitializer; +import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelOption; +import io.netty.channel.ChannelOption;
+import io.netty.channel.socket.nio.NioEventLoopGroup; +import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.nio.NioServerSocketChannel; +import io.netty.channel.socket.nio.NioServerSocketChannel;
+import io.netty.handler.timeout.ReadTimeoutHandler; +import io.netty.handler.timeout.ReadTimeoutHandler;
+import java.net.InetAddress; +import java.net.InetAddress;
@ -849,7 +849,7 @@ index 0000000..6ecbca7
+} +}
diff --git a/src/main/java/org/spigotmc/netty/PacketEncoder.java b/src/main/java/org/spigotmc/netty/PacketEncoder.java diff --git a/src/main/java/org/spigotmc/netty/PacketEncoder.java b/src/main/java/org/spigotmc/netty/PacketEncoder.java
new file mode 100644 new file mode 100644
index 0000000..11aa05f index 0000000..9d0b06c
--- /dev/null --- /dev/null
+++ b/src/main/java/org/spigotmc/netty/PacketEncoder.java +++ b/src/main/java/org/spigotmc/netty/PacketEncoder.java
@@ -0,0 +1,43 @@ @@ -0,0 +1,43 @@
@ -890,7 +890,7 @@ index 0000000..11aa05f
+ public void freeOutboundBuffer(ChannelHandlerContext ctx) throws Exception { + public void freeOutboundBuffer(ChannelHandlerContext ctx) throws Exception {
+ super.freeOutboundBuffer(ctx); + super.freeOutboundBuffer(ctx);
+ if (outBuf != null) { + if (outBuf != null) {
+ outBuf.free(); + outBuf.release();
+ outBuf = null; + outBuf = null;
+ } + }
+ dataOut = null; + dataOut = null;