Mojang allows multiple status queries in a connection, we should too.

This commit is contained in:
md_5 2014-06-11 16:07:14 +10:00
parent 9604a9a31e
commit 77f6930280

View File

@ -95,7 +95,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
private enum State private enum State
{ {
HANDSHAKE, STATUS, PING, USERNAME, ENCRYPT, FINISHED; HANDSHAKE, STATUS, USERNAME, ENCRYPT, FINISHED;
} }
@Override @Override
@ -185,16 +185,13 @@ public class InitialHandler extends PacketHandler implements PendingConnection
motd, BungeeCord.getInstance().config.getFaviconObject() ), motd, BungeeCord.getInstance().config.getFaviconObject() ),
null ); null );
} }
thisState = State.PING;
} }
@Override @Override
public void handle(PingPacket ping) throws Exception public void handle(PingPacket ping) throws Exception
{ {
Preconditions.checkState( thisState == State.PING, "Not expecting PING" ); Preconditions.checkState( thisState == State.STATUS, "Not expecting STATUS" );
unsafe.sendPacket( ping ); unsafe.sendPacket( ping );
disconnect( "" );
} }
@Override @Override