From 9a0797973311f90c116fc3b2a9a293d75bc5ed6a Mon Sep 17 00:00:00 2001 From: "Kristian S. Stangeland" Date: Tue, 10 Dec 2013 16:38:23 +0100 Subject: [PATCH] Ensure the new style listener gets the correct GamePhase in 1.6.4. Also adding in a test image for our ServerPing wrapper. --- ProtocolLib/.gitignore | 3 ++- .../protocol/injector/LoginPackets.java | 4 ++++ ProtocolLib/src/test/resources/tux.png | Bin 0 -> 4382 bytes 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 ProtocolLib/src/test/resources/tux.png diff --git a/ProtocolLib/.gitignore b/ProtocolLib/.gitignore index 9f970225..a059a76d 100644 --- a/ProtocolLib/.gitignore +++ b/ProtocolLib/.gitignore @@ -1 +1,2 @@ -target/ \ No newline at end of file +target/ +/logs diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/LoginPackets.java b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/LoginPackets.java index 326cd03d..9f90fb55 100644 --- a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/LoginPackets.java +++ b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/LoginPackets.java @@ -6,6 +6,7 @@ import com.comphenix.protocol.PacketType; import com.comphenix.protocol.Packets; import com.comphenix.protocol.concurrency.IntegerSet; import com.comphenix.protocol.events.ConnectionSide; +import com.comphenix.protocol.utility.MinecraftReflection; import com.comphenix.protocol.utility.MinecraftVersion; /** @@ -78,6 +79,9 @@ class LoginPackets { * @return TRUE if it may, FALSE otherwise. */ public boolean isLoginPacket(PacketType type) { + if (!MinecraftReflection.isUsingNetty()) + return isLoginPacket(type.getLegacyId(), type.getSender().toSide()); + return PacketType.Login.Client.getInstance().hasMember(type) || PacketType.Login.Server.getInstance().hasMember(type) || PacketType.Status.Client.getInstance().hasMember(type) || diff --git a/ProtocolLib/src/test/resources/tux.png b/ProtocolLib/src/test/resources/tux.png new file mode 100644 index 0000000000000000000000000000000000000000..99f3465e53072fbd5f37817617219068c1a5be5d GIT binary patch literal 4382 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