Merge branch 'master' into dev

This commit is contained in:
NikkyAI 2018-02-09 20:02:10 +01:00 committed by Unknown
commit 2739011ab7
2 changed files with 10 additions and 3 deletions

View File

@ -26,3 +26,7 @@ requires api section to be setup along these lines
values you need to remember are obviously the IP, port and token values you need to remember are obviously the IP, port and token
MatterLInk will need them in the configuration MatterLInk will need them in the configuration
## Downloads
https://ci.elytradev.com/job/elytra/job/MatterLink/job/master/

View File

@ -11,10 +11,13 @@ object PlayerListCommand : IBridgeCommand {
override val help: String = "Lists online players." override val help: String = "Lists online players."
override fun call(args: String): Boolean { override fun call(args: String): Boolean {
if (args.isNotBlank()) return false if (args.isNotBlank()) return false
val playerList = FMLCommonHandler.instance().minecraftServerInstance.playerList.onlinePlayerNames
MessageHandler.transmit(ApiMessage( MessageHandler.transmit(ApiMessage(
username = cfg!!.relay.systemUser, username = cfg!!.relay.systemUser,
text = MatterLink.wrappedPlayerList().joinToString(" ") { it.antiping() } text = when {
playerList.isNotEmpty() -> "players: " + playerList.joinToString(" ") { it.antiping() }
else -> "No Players online"
}
)) ))
return true return true