#1537: Allow /send <server> <server>.

If the first argument is a server, send all players from that server. Servers take priority in the case a player and server share a name.
This commit is contained in:
md_5 2015-07-13 19:32:12 +10:00
parent f3c14cf064
commit 6e5132f914

View File

@ -56,13 +56,24 @@ public class CommandSend extends Command implements TabExecutor
} }
} else } else
{ {
ProxiedPlayer player = ProxyServer.getInstance().getPlayer( args[0] ); // If we use a server name, send the entire server. This takes priority over players.
if ( player == null ) ServerInfo serverTarget = ProxyServer.getInstance().getServerInfo( args[0] );
if ( serverTarget != null )
{ {
sender.sendMessage( ChatColor.RED + "That player is not online" ); for ( ProxiedPlayer p : serverTarget.getPlayers() )
return; {
summon( p, target, sender );
}
} else
{
ProxiedPlayer player = ProxyServer.getInstance().getPlayer( args[0] );
if ( player == null )
{
sender.sendMessage( ChatColor.RED + "That player is not online" );
return;
}
summon( player, target, sender );
} }
summon( player, target, sender );
} }
sender.sendMessage( ChatColor.GREEN + "Successfully summoned player(s)" ); sender.sendMessage( ChatColor.GREEN + "Successfully summoned player(s)" );
} }