From c1dfd0fb7b1cc20ffdb62ca11f3dd30678530332 Mon Sep 17 00:00:00 2001 From: Robin Lambertz Date: Tue, 21 May 2013 22:14:00 +0200 Subject: [PATCH] Add global PlayerCount if target is "ALL" This allows bukkit servers to get the global bungeecord player count. --- .../bungee/connection/DownstreamBridge.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java index 19b9b9603..19d5a9250 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java @@ -264,12 +264,19 @@ public class DownstreamBridge extends PacketHandler } if ( subChannel.equals( "PlayerCount" ) ) { - ServerInfo server = bungee.getServerInfo( in.readUTF() ); - if ( server != null ) + String target = in.readUTF(); + out.writeUTF( "PlayerCount" ); + if ( target.equals( "ALL" ) ) { - out.writeUTF( "PlayerCount" ); - out.writeUTF( server.getName() ); - out.writeInt( server.getPlayers().size() ); + out.writeInt( bungee.getPlayers().size() ); + } else + { + ServerInfo server = bungee.getServerInfo( target ); + if ( server != null ) + { + out.writeUTF( server.getName() ); + out.writeInt( server.getPlayers().size() ); + } } } if ( subChannel.equals( "PlayerList" ) )