Fixed small bug where sometimes player.protocol wouldn't update.

Author: AMorporkian

core_plugins/player_manager/manager.py

@@ -109,7 +109,6 @@ class Ban(Base):
     reason = Column(String)
 
 
-# noinspection PyArgumentList
 class PlayerManager(object):
     def __init__(self, config):
         self.config = config
@@ -118,6 +117,7 @@ def __init__(self, config):
         Base.metadata.create_all(self.engine)
         for player in self.session.query(Player).all():
             player.logged_in = False
+            player.protocol = None
 
     def fetch_or_create(self, uuid, name, ip, protocol=None):
         if self.session.query(Player).filter_by(uuid=uuid, logged_in=True).first():

server.py

@@ -425,8 +425,10 @@ def connectionLost(self, reason=connectionDone):
             x = build_packet(packets.Packets.CLIENT_DISCONNECT,
                              packets.client_disconnect().build(Container(data=0)))
 
-            if self.player and self.player.logged_in:
+            if self.player is not None:
                 self.client_disconnect(x)
+                self.player.logged_in = False
+                self.player.protocol = None
             self.client_protocol.transport.write(x)
         except:
             logger.error("Couldn't disconnect protocol.")
@@ -481,8 +483,7 @@ def string_received(self, packet):
         try:
             if self.server_protocol.handle_starbound_packets(
                     packet):
-                self.server_protocol.write(
-                    packet.original_data)
+                self.server_protocol.write(packet.original_data)
         except construct.core.FieldError:
             logger.exception("Construct field error in string_received.", exc_info=True)
             self.server_protocol.write(