ChCh
/
CloudBot
Archived
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into refresh

This commit is contained in:
Luke Rogers 2014-02-16 17:46:20 +13:00
parent 91b6d1d8f1 92796a218f
commit 2d90288856
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/slaps.json
View File

@ -30,7 +30,7 @@
"baguette",
"physics textbook",
"toaster",
"portrait of Mark Harmon",
"portrait of Richard Stallman",
"television",
"mau5head",
"five ton truck",

9
plugins/minecraft_ping.py
View File

@ -76,13 +76,16 @@ def mcping_modern(host, port):
data = json.loads(d.decode('utf8'))
try:
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"]
online = data["players"]["online"]
except Exception as e:
return "Invalid data: {}; error: {}".format(data, e)
return mc_color_format(u"{}\x0f - {}\x0f - {}/{} players *".format(desc, version, online,
max_players)).replace("\n", u"\x0f - ")
return mc_color_format(u"{}\x0f - {}\x0f - {}/{} players.".format(desc, version, online,
max_players)).replace("\n", u"\x0f - ")
def mcping_legacy(host, port):