Upstream/ProtocolLib
1
0
Fork 0
mirror of https://github.com/dmulloy2/ProtocolLib.git synced 2024-11-30 22:53:26 +01:00
Code Issues Projects Releases Wiki Activity

Ensure the new style listener gets the correct GamePhase in 1.6.4.

Browse Source 
Also adding in a test image for our ServerPing wrapper.
This commit is contained in:
Kristian S. Stangeland 2013-12-10 16:38:23 +01:00
parent c23e5c98f8
commit 9a07979733
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ProtocolLib/.gitignore vendored
View File

@ -1 +1,2 @@
target/ target/
/logs

4
ProtocolLib/src/main/java/com/comphenix/protocol/injector/LoginPackets.java
View File

@ -6,6 +6,7 @@ import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.Packets; import com.comphenix.protocol.Packets;
import com.comphenix.protocol.concurrency.IntegerSet; import com.comphenix.protocol.concurrency.IntegerSet;
import com.comphenix.protocol.events.ConnectionSide; import com.comphenix.protocol.events.ConnectionSide;
import com.comphenix.protocol.utility.MinecraftReflection;
import com.comphenix.protocol.utility.MinecraftVersion; import com.comphenix.protocol.utility.MinecraftVersion;
/** /**
@ -78,6 +79,9 @@ class LoginPackets {
* @return TRUE if it may, FALSE otherwise. * @return TRUE if it may, FALSE otherwise.
*/ */
public boolean isLoginPacket(PacketType type) { public boolean isLoginPacket(PacketType type) {
if (!MinecraftReflection.isUsingNetty())
return isLoginPacket(type.getLegacyId(), type.getSender().toSide());
return PacketType.Login.Client.getInstance().hasMember(type) || return PacketType.Login.Client.getInstance().hasMember(type) ||
PacketType.Login.Server.getInstance().hasMember(type) || PacketType.Login.Server.getInstance().hasMember(type) ||
PacketType.Status.Client.getInstance().hasMember(type) || PacketType.Status.Client.getInstance().hasMember(type) ||

BIN
ProtocolLib/src/test/resources/tux.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB