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

Fixed issues @daboross - closes #208

Browse source
This commit is contained in:
Luke Rogers 2014-02-23 13:30:24 +13:00
parent 13df70da1b
commit 90a91c1ef8
1 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
plugins/minecraft_ping.py
View file

@ -1,6 +1,7 @@
import socket import socket
import struct import struct
import json import json
import traceback
from util import hook from util import hook
@ -87,16 +88,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"]
if data["description"].get("text", None): try:
desc = u" ".join(data["description"]["text"].split()) desc = u" ".join(data["description"]["text"].split())
else: except TypeError:
desc = u" ".join(data["description"].split()) 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:
from pprint import pprint traceback.print_exc(e)
pprint(data) raise PingError("Unknown Error: {}".format(e))
return "Invalid data - check console ({})".format(e)
output = { output = {
"motd": format_colors(desc), "motd": format_colors(desc),
@ -111,12 +111,16 @@ def mcping_modern(host, port):
def mcping_legacy(host, port): def mcping_legacy(host, port):
""" pings a server using the legacy (1.6 and older) protocol and returns data """ """ pings a server using the legacy (1.6 and older) protocol and returns data """
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
try:
sock.connect((host, port)) sock.connect((host, port))
sock.send('\xfe\x01') sock.send('\xfe\x01')
response = sock.recv(1) response = sock.recv(1)
except socket.timeout:
raise PingError("Request timed out")
print response print response
if response[0] != '\xff': if response[0] != '\xff':
return "Server gave invalid response: " + repr(response) raise PingError("Invalid response")
length = struct.unpack('!h', sock.recv(2))[0] length = struct.unpack('!h', sock.recv(2))[0]
values = sock.recv(length * 2).decode('utf-16be') values = sock.recv(length * 2).decode('utf-16be')
data = values.split(u'\x00') # try to decode data using new format data = values.split(u'\x00') # try to decode data using new format
@ -206,10 +210,11 @@ def mcping(inp):
try: try:
data = mcping_modern(host, port) data = mcping_modern(host, port)
return format_output(data)
except PingError: except PingError:
try: try:
data = mcping_legacy(host, port) data = mcping_legacy(host, port)
return format_output(data) except PingError as e:
except PingError: print e
return "The server {} ({}:{}) looks offline from here.".format(inp, host, port) return "The server {} ({}:{}) looks offline from here.".format(inp, host, port)
return format_output(data)