Archiviert
13
0

Fix timeout error with MCPC 1.6.4

Fixes aadnk#90
Dieser Commit ist enthalten in:
Dan Mulloy 2015-06-28 15:55:11 -04:00
Ursprung 74b1d93209
Commit 7b9e0cdb65

Datei anzeigen

@ -28,22 +28,23 @@ class LoginPackets {
serverSide.add(Packets.Server.KEY_RESPONSE); serverSide.add(Packets.Server.KEY_RESPONSE);
clientSide.add(Packets.Client.CLIENT_COMMAND); clientSide.add(Packets.Client.CLIENT_COMMAND);
serverSide.add(Packets.Server.LOGIN); serverSide.add(Packets.Server.LOGIN);
// List ping // List ping
clientSide.add(Packets.Client.GET_INFO); clientSide.add(Packets.Client.GET_INFO);
// In 1.6.2, Minecraft started sending CUSTOM_PAYLOAD in the server list protocol // In 1.6.2, Minecraft started sending CUSTOM_PAYLOAD in the server list protocol
if (version.compareTo(MinecraftVersion.HORSE_UPDATE) >= 0) { // MCPC+/Cauldron contains Forge, which uses CUSTOM_PAYLOAD during login
if (version.isAtLeast(MinecraftVersion.HORSE_UPDATE) || isCauldronOrMCPC()) {
clientSide.add(Packets.Client.CUSTOM_PAYLOAD); clientSide.add(Packets.Client.CUSTOM_PAYLOAD);
} }
serverSide.add(Packets.Server.KICK_DISCONNECT);
// MCPC+/Cauldron contains Forge, which uses packet 250 during login
if (isCauldronOrMCPC()) { if (isCauldronOrMCPC()) {
clientSide.add(Packets.Client.CUSTOM_PAYLOAD); serverSide.add(Packets.Server.CUSTOM_PAYLOAD);
} }
serverSide.add(Packets.Server.KICK_DISCONNECT);
} }
/** /**
* Determine if we are running MCPC or Cauldron. * Determine if we are running MCPC or Cauldron.
* @return TRUE if we are, FALSE otherwise. * @return TRUE if we are, FALSE otherwise.