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

Fixed support for the old server ping format

Browse source
This commit is contained in:
Luke Rogers 2012-12-10 02:22:50 +13:00
parent 9f2bffa7a5
commit 0f15a27cda
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
plugins/mctools.py
View file

@ -10,14 +10,26 @@ def mcping_connect(host, port):
sock.connect((host, port))
sock.send('\xfe\x01')
response = sock.recv(1)
print response
if response[0] != '\xff':
return "Server gave invalid response: " + repr(response)
length = struct.unpack('!h', sock.recv(2))[0]
values = sock.recv(length * 2).decode('utf-16be').split(u'\x00')
values = sock.recv(length * 2).decode('utf-16be')
data = values.split(u'\x00') # try to decode data using new format
if len(data) == 1:
# failed to decode data, server is using old format
data = values.split(u'\xa7')
message = u"{} - {}/{} players".format(data[0], data[1], data[2])
else:
# decoded data, server is using new format
message = u"{} - {} - {}/{} players".format(data[3], data[2], data[4], data[5])
sock.close()
return u"{} - Minecraft {} - {}/{} players".format(values[3], values[2], values[4], values[5])
return message
except:
return "Error pinging " + host + ":" + str(port) +\
", is it up? Double-check your address!"