Upstream/pyCraft
1
0
Fork 0
mirror of https://github.com/ammaraskar/pyCraft.git synced 2024-11-26 04:05:59 +01:00
Code Issues Projects Releases Wiki Activity

Fix connection to work with new authentication module

Browse Source
This commit is contained in:
Ammar Askar 2015-04-02 22:02:08 +05:00
parent 0347894fd8
commit b37c095039
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
minecraft/authentication.py
View File

@ -253,10 +253,10 @@ class AuthenticationToken(object):
"selectedProfile": self.profile.to_dict(), "selectedProfile": self.profile.to_dict(),
"serverId": server_id}) "serverId": server_id})
if req.status_code == requests.codes.ok: if not req.raise_for_status():
return True return True
else: else:
raise YggdrasilError("Failed to join game.") _raise_from_request(req)
def _make_request(server, endpoint, data): def _make_request(server, endpoint, data):
@ -284,14 +284,17 @@ def _raise_from_request(req):
if req.status_code == requests.codes.ok: if req.status_code == requests.codes.ok:
return None return None
json_resp = req.json() try:
json_resp = req.json()
if "error" not in json_resp and "errorMessage" not in json_resp: if "error" not in json_resp and "errorMessage" not in json_resp:
raise YggdrasilError("Malformed error message.") raise YggdrasilError("Malformed error message.")
message = "[{status_code}] {error}: '{error_message}'" message = "[{status_code}] {error}: '{error_message}'"
message = message.format(status_code=str(req.status_code), message = message.format(status_code=str(req.status_code),
error=json_resp["error"], error=json_resp["error"],
error_message=json_resp["errorMessage"]) error_message=json_resp["errorMessage"])
except ValueError:
message = "Unknwon requests error: " + str(req.status_code)
raise YggdrasilError(message) raise YggdrasilError(message)

2
minecraft/networking/connection.py
View File

@ -120,7 +120,7 @@ class Connection(object):
self.reactor = LoginReactor(self) self.reactor = LoginReactor(self)
self._start_network_thread() self._start_network_thread()
login_start_packet = LoginStartPacket() login_start_packet = LoginStartPacket()
login_start_packet.name = self.auth_token.username login_start_packet.name = self.auth_token.profile.name
self.write_packet(login_start_packet) self.write_packet(login_start_packet)
def _connect(self): def _connect(self):