Upstream/BungeeCord
1
0
Fork 0
mirror of https://github.com/SpigotMC/BungeeCord.git synced 2024-11-27 20:59:12 +01:00
Code Issues Projects Releases Wiki Activity

[Breaking] Fix player online sample

Browse Source
This commit is contained in:
md_5 2013-11-01 22:00:46 +11:00
parent 02619c6132
commit 4040d9f20a
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/src/main/java/net/md_5/bungee/api/ServerPing.java
View File

@ -33,10 +33,9 @@ public class ServerPing
private int max; private int max;
private int online; private int online;
private PlayerInfo[] sample;
} }
private PlayerInfo[] sample;
@Data @Data
@AllArgsConstructor @AllArgsConstructor
public static class PlayerInfo public static class PlayerInfo

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

@ -123,7 +123,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
public void handle(LegacyPing ping) throws Exception public void handle(LegacyPing ping) throws Exception
{ {
ServerPing legacy = new ServerPing( new ServerPing.Protocol( bungee.getGameVersion(), bungee.getProtocolVersion() ), ServerPing legacy = new ServerPing( new ServerPing.Protocol( bungee.getGameVersion(), bungee.getProtocolVersion() ),
new ServerPing.Players( listener.getMaxPlayers(), bungee.getOnlineCount() ), null, listener.getMotd(), null ); new ServerPing.Players( listener.getMaxPlayers(), bungee.getOnlineCount(), null ), listener.getMotd(), null );
legacy = bungee.getPluginManager().callEvent( new ProxyPingEvent( this, legacy ) ).getResponse(); legacy = bungee.getPluginManager().callEvent( new ProxyPingEvent( this, legacy ) ).getResponse();
String kickMessage = ChatColor.DARK_BLUE String kickMessage = ChatColor.DARK_BLUE
@ -169,8 +169,8 @@ public class InitialHandler extends PacketHandler implements PendingConnection
{ {
pingBack.done( new ServerPing( pingBack.done( new ServerPing(
new ServerPing.Protocol( bungee.getGameVersion(), bungee.getProtocolVersion() ), new ServerPing.Protocol( bungee.getGameVersion(), bungee.getProtocolVersion() ),
new ServerPing.Players( listener.getMaxPlayers(), bungee.getOnlineCount() ), new ServerPing.Players( listener.getMaxPlayers(), bungee.getOnlineCount(), null ),
null, motd, BungeeCord.getInstance().config.favicon ), motd, BungeeCord.getInstance().config.favicon ),
null ); null );
} }