ChCh/CloudBot
Archived
11
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixed up mcping

Browse source
This commit is contained in:
Luke Rogers 2014-02-16 17:26:53 +13:00
parent 160785e92c
commit 45a1f65748
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
plugins/minecraft_ping.py
View file

@ -76,13 +76,16 @@ def mcping_modern(host, port):
data = json.loads(d.decode('utf8')) data = json.loads(d.decode('utf8'))
try: try:
version = data["version"]["name"] version = data["version"]["name"]
desc = data["description"] if data["description"].get("text", None):
desc = u" ".join(data["description"]["text"].split())
else:
desc = u" ".join(data["description"].split())
max_players = data["players"]["max"] max_players = data["players"]["max"]
online = data["players"]["online"] online = data["players"]["online"]
except Exception as e: except Exception as e:
return "Invalid data: {}; error: {}".format(data, e) return "Invalid data: {}; error: {}".format(data, e)
return mc_color_format(u"{}\x0f - {}\x0f - {}/{} players *".format(desc, version, online, return mc_color_format(u"{}\x0f - {}\x0f - {}/{} players.".format(desc, version, online,
max_players)).replace("\n", u"\x0f - ") max_players)).replace("\n", u"\x0f - ")
def mcping_legacy(host, port): def mcping_legacy(host, port):