From 3e21bba4eeed2a1911e52e3da43be3ec901e3cc5 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 9 Feb 2013 22:54:14 +1100 Subject: [PATCH] Remove debug code now that we know it can be called. --- CraftBukkit-Patches/0026-Netty.patch | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/CraftBukkit-Patches/0026-Netty.patch b/CraftBukkit-Patches/0026-Netty.patch index c0d5191499..eb15ef7db8 100644 --- a/CraftBukkit-Patches/0026-Netty.patch +++ b/CraftBukkit-Patches/0026-Netty.patch @@ -1,4 +1,4 @@ -From 7c5deba6cc92d48692d23ae5a7aef77a6bf18e45 Mon Sep 17 00:00:00 2001 +From c5070a0077eb84a0f287c72dfe48565a380ed779 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 3 Feb 2013 10:24:33 +1100 Subject: [PATCH] Netty @@ -16,13 +16,13 @@ This commit is licensed under the Creative Commons Attribution-ShareAlike 3.0 Un .../java/net/minecraft/server/DedicatedServer.java | 2 +- .../net/minecraft/server/PendingConnection.java | 11 +- src/main/java/org/spigotmc/netty/CipherCodec.java | 65 ++++++ - .../org/spigotmc/netty/NettyNetworkManager.java | 204 +++++++++++++++++ + .../org/spigotmc/netty/NettyNetworkManager.java | 203 +++++++++++++++++ .../org/spigotmc/netty/NettyServerConnection.java | 98 ++++++++ .../org/spigotmc/netty/NettySocketAdaptor.java | 248 +++++++++++++++++++++ .../java/org/spigotmc/netty/PacketDecoder.java | 52 +++++ .../java/org/spigotmc/netty/PacketEncoder.java | 43 ++++ .../java/org/spigotmc/netty/PacketListener.java | 100 +++++++++ - 10 files changed, 829 insertions(+), 4 deletions(-) + 10 files changed, 828 insertions(+), 4 deletions(-) create mode 100644 src/main/java/org/spigotmc/netty/CipherCodec.java create mode 100644 src/main/java/org/spigotmc/netty/NettyNetworkManager.java create mode 100644 src/main/java/org/spigotmc/netty/NettyServerConnection.java @@ -176,10 +176,10 @@ index 0000000..cfc0535 +} diff --git a/src/main/java/org/spigotmc/netty/NettyNetworkManager.java b/src/main/java/org/spigotmc/netty/NettyNetworkManager.java new file mode 100644 -index 0000000..0e5bb8c +index 0000000..47d7676 --- /dev/null +++ b/src/main/java/org/spigotmc/netty/NettyNetworkManager.java -@@ -0,0 +1,204 @@ +@@ -0,0 +1,203 @@ +package org.spigotmc.netty; + +import io.netty.channel.Channel; @@ -326,7 +326,6 @@ index 0000000..0e5bb8c + public void b() { + for (int i = 1000; !syncPackets.isEmpty() && i >= 0; i--) { + if (handler instanceof PendingConnection ? ((PendingConnection) handler).c : ((PlayerConnection) handler).disconnected) { -+ Bukkit.getLogger().info("[Spigot Debug] Skipped ticking player packet due to being disconnected"); + continue; + } +