diff --git a/data/slaps.json b/data/slaps.json index 8e97e87..6ec0166 100644 --- a/data/slaps.json +++ b/data/slaps.json @@ -30,7 +30,7 @@ "baguette", "physics textbook", "toaster", - "portrait of Mark Harmon", + "portrait of Richard Stallman", "television", "mau5head", "five ton truck", diff --git a/plugins/minecraft_ping.py b/plugins/minecraft_ping.py index d746f44..ea254dc 100644 --- a/plugins/minecraft_ping.py +++ b/plugins/minecraft_ping.py @@ -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):