PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Ping stuffs, doesnt seem to work for some reason though

Browse Source
This commit is contained in:
md_5
2013-10-12 13:51:33 +11:00
parent e0ebf1af21
commit 1551bf6f3a
3 changed files with 42 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
View File

@@ -50,6 +50,7 @@ import net.md_5.bungee.protocol.packet.LoginRequest;
import net.md_5.bungee.protocol.packet.LoginSuccess;
import net.md_5.bungee.protocol.packet.PingPacket;
import net.md_5.bungee.protocol.packet.StatusRequest;
import net.md_5.bungee.protocol.packet.StatusResponse;
@RequiredArgsConstructor
public class InitialHandler extends PacketHandler implements PendingConnection
@@ -102,8 +103,8 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public void handle(PacketWrapper packet) throws Exception
{
int len = DefinedPacket.readVarInt( packet.buf );
int id = DefinedPacket.readVarInt( packet.buf );
// int len = DefinedPacket.readVarInt( packet.buf );
// int id = DefinedPacket.readVarInt( packet.buf );
// throw new UnsupportedOperationException( "Cannot handle unknown packet at login!" );
}
@@ -129,6 +130,8 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public void handle(StatusRequest statusRequest) throws Exception
{
Preconditions.checkState( thisState == State.STATUS, "Not expecting STATUS" );
ServerInfo forced = AbstractReconnectHandler.getForcedHost( this );
final String motd = ( forced != null ) ? forced.getMotd() : listener.getMotd();
@@ -139,18 +142,13 @@ public class InitialHandler extends PacketHandler implements PendingConnection
{
if ( error != null )
{
result = new ServerPing( (byte) -1, "-1", "Error pinging remote server: " + Util.exception( error ), -1, -1 );
result = new ServerPing();
result.setDescription( "Error pinging remote server: " + Util.exception( error ) );
}
result = bungee.getPluginManager().callEvent( new ProxyPingEvent( InitialHandler.this, result ) ).getResponse();
String kickMessage = ChatColor.DARK_BLUE
+ "\00" + result.getProtocolVersion()
+ "\00" + result.getGameVersion()
+ "\00" + result.getMotd()
+ "\00" + result.getCurrentPlayers()
+ "\00" + result.getMaxPlayers();
BungeeCord.getInstance().getConnectionThrottle().unthrottle( getAddress().getAddress() );
disconnect( kickMessage );
unsafe.sendPacket( new StatusResponse( BungeeCord.getInstance().gson.toJson( result ) ) );
}
};
@@ -159,8 +157,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
forced.ping( pingBack );
} else
{
pingBack.done( new ServerPing( bungee.getProtocolVersion(), bungee.getGameVersion(), motd, bungee.getOnlineCount(), listener.getMaxPlayers() ), null );
pingBack.done( new ServerPing(
new ServerPing.Protocol( bungee.getGameVersion(), bungee.getProtocolVersion() ),
new ServerPing.Players( bungee.getOnlineCount(), listener.getMaxPlayers() ),
motd ),
null );
}
thisState = State.PING;
}
@Override

4
proxy/src/main/java/net/md_5/bungee/connection/PingHandler.java
View File

@@ -37,8 +37,8 @@ public class PingHandler extends PacketHandler
public void handle(Kick kick) throws Exception
{
String[] split = kick.getMessage().split( "\00" );
ServerPing ping = new ServerPing( Byte.parseByte( split[1] ), split[2], split[3], Integer.parseInt( split[4] ), Integer.parseInt( split[5] ) );
callback.done( ping, null );
// ServerPing ping = new ServerPing( Byte.parseByte( split[1] ), split[2], split[3], Integer.parseInt( split[4] ), Integer.parseInt( split[5] ) );
// callback.done( ping, null );
}
@Override