Better packet dumping.

Author: AMorporkian

packet_stream.py

@@ -71,10 +71,12 @@ def check_packet(self):
                         z = zlib.decompressobj()
                         p_parsed.data = z.decompress(p_parsed.data)
                     except zlib.error:
+
                         self.logger.error("Decompression error in check_packet.")
                         self.logger.trace("Packet data:")
-                        for line in pprint.pformat(p_parsed):
-                            self.logger.trace(line)
+                        self.logger.trace(pprint.pformat(p_parsed.original_data))
+                        self.logger.trace("Following packet data:")
+                        self.logger.trace(pprint.pformat(self._stream.encode("hex")))
                         raise
                 packet = Packet(packet_id=p_parsed.id, payload_size=p_parsed.payload_size, data=p_parsed.data,
                                 original_data=p, direction=self.direction)

server.py

@@ -21,7 +21,7 @@
 from utility_functions import build_packet
 
 VERSION = "1.2.3"
-TRACE = False
+TRACE = True
 TRACE_LVL = 9
 logging.addLevelName(9, "TRACE")
 logging.Logger.trace = lambda s, m, *a, **k: s._log(TRACE_LVL, m, a, **k)
@@ -433,7 +433,8 @@ def connectionLost(self, reason=connectionDone):
                              packets.client_disconnect().build(Container(data=0)))
 
             if self.player is not None:
-                self.client_disconnect(x)
+                if self.protocol is None:
+                    self.client_disconnect(x)
                 self.player.logged_in = False
                 self.player.protocol = None
             self.client_protocol.transport.write(x)