From 9bca4e4b70efae8cc667e04df92b9a583f61b265 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 9 Feb 2013 21:28:34 +1100 Subject: [PATCH] Add debug to see if statement is ever true --- CraftBukkit-Patches/0026-Netty.patch | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/CraftBukkit-Patches/0026-Netty.patch b/CraftBukkit-Patches/0026-Netty.patch index 5c0162fbb..0ad45d792 100644 --- a/CraftBukkit-Patches/0026-Netty.patch +++ b/CraftBukkit-Patches/0026-Netty.patch @@ -1,4 +1,4 @@ -From b789b1161941b447aea0312f249e3addc123e29c Mon Sep 17 00:00:00 2001 +From 7c291f31800391938b5f0e3af1a05940e65a73ba 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 | 198 ++++++++++++++++ + .../org/spigotmc/netty/NettyNetworkManager.java | 200 +++++++++++++++++ .../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, 823 insertions(+), 4 deletions(-) + 10 files changed, 825 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..e97e77a +index 0000000..8236faa --- /dev/null +++ b/src/main/java/org/spigotmc/netty/NettyNetworkManager.java -@@ -0,0 +1,198 @@ +@@ -0,0 +1,200 @@ +package org.spigotmc.netty; + +import io.netty.channel.Channel; @@ -202,6 +202,7 @@ index 0000000..e97e77a +import net.minecraft.server.PendingConnection; +import net.minecraft.server.PlayerConnection; +import org.bouncycastle.crypto.BufferedBlockCipher; ++import org.bukkit.Bukkit; + +/** + * This class forms the basis of the Netty integration. It implements @@ -326,6 +327,7 @@ index 0000000..e97e77a + 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; + } +