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

Merge branch 'develop' into refresh

Browse source
This commit is contained in:
Luke Rogers 2014-02-16 17:46:20 +13:00
commit 2d90288856
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/slaps.json
View file

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

7
plugins/minecraft_ping.py
View file

@ -76,12 +76,15 @@ 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 - ")