From fb324452c28c92ecbe018b3a9763851c126e5370 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 17 Feb 2013 20:15:48 +1100
Subject: [PATCH] Update to actually compile with netty beta

---
 CraftBukkit-Patches/0025-Netty.patch | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/CraftBukkit-Patches/0025-Netty.patch b/CraftBukkit-Patches/0025-Netty.patch
index 9f1b613..bcb5964 100644
--- a/CraftBukkit-Patches/0025-Netty.patch
+++ b/CraftBukkit-Patches/0025-Netty.patch
@@ -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>
 Date: Thu, 14 Feb 2013 17:32:20 +1100
 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
 new file mode 100644
-index 0000000..cfc0535
+index 0000000..f25af14
 --- /dev/null
 +++ b/src/main/java/org/spigotmc/netty/CipherCodec.java
 @@ -0,0 +1,65 @@
@@ -184,7 +184,7 @@ index 0000000..cfc0535
 +    public void freeOutboundBuffer(ChannelHandlerContext ctx) throws Exception {
 +        super.freeOutboundBuffer(ctx);
 +        if (heapOut != null) {
-+            heapOut.free();
++            heapOut.release();
 +            heapOut = 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
 new file mode 100644
-index 0000000..edf4f85
+index 0000000..cb1687c
 --- /dev/null
 +++ b/src/main/java/org/spigotmc/netty/NettyServerConnection.java
 @@ -0,0 +1,105 @@
@@ -427,7 +427,7 @@ index 0000000..edf4f85
 +import io.netty.channel.ChannelFuture;
 +import io.netty.channel.ChannelInitializer;
 +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.handler.timeout.ReadTimeoutHandler;
 +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
 new file mode 100644
-index 0000000..11aa05f
+index 0000000..9d0b06c
 --- /dev/null
 +++ b/src/main/java/org/spigotmc/netty/PacketEncoder.java
 @@ -0,0 +1,43 @@
@@ -890,7 +890,7 @@ index 0000000..11aa05f
 +    public void freeOutboundBuffer(ChannelHandlerContext ctx) throws Exception {
 +        super.freeOutboundBuffer(ctx);
 +        if (outBuf != null) {
-+            outBuf.free();
++            outBuf.release();
 +            outBuf = null;
 +        }
 +        dataOut = null;