Fixed issue with unclean broken connections being reported as banned

Author: AMorporkian

core_plugins/player_manager/plugin.py

@@ -1,7 +1,8 @@
 from construct import Container
+from twisted.internet.task import LoopingCall
 from twisted.words.ewords import AlreadyLoggedIn
 from base_plugin import BasePlugin
-from manager import PlayerManager, Banned
+from manager import PlayerManager, Banned, Player
 from packets import client_connect, connect_response
 import packets
 from utility_functions import build_packet, Planet
@@ -13,6 +14,18 @@ class PlayerManagerPlugin(BasePlugin):
     def activate(self):
         super(PlayerManagerPlugin, self).activate()
         self.player_manager = PlayerManager(self.config)
+        self.l_call = LoopingCall(self.check_logged_in)
+        self.factory = None
+
+    def check_logged_in(self):
+        for player in self.player_manager.session.query(Player).filter_by(logged_in=True).all():
+            if player.protocol not in self.factory.protocols.keys():
+                player.logged_in = False
+    def on_protocol_version(self, data):
+        if not self.l_call.running:
+            self.factory = self.protocol.factory
+            self.l_call.start(.25)
+        return True
 
     def on_client_connect(self, data):
         client_data = client_connect().parse(data.data)
@@ -23,9 +36,23 @@ def on_client_connect(self, data):
                 ip=self.protocol.transport.getHost().host,
                 protocol=self.protocol.id)
             return True
-        except (AlreadyLoggedIn, Banned):
+        except AlreadyLoggedIn:
+            dc_packet = build_packet(
+                packets.Packets.CONNECT_RESPONSE,
+                packets.connect_response().build(
+                    Container(
+                        success=False,
+                        client_id=0,
+                        reject_reason="You are already connected!"
+                    )
+                )
+            )
+            self.protocol.transport.write(dc_packet)
+            self.protocol.transport.loseConnection()
+            self.logger.info("Already logged in user tried to log in.")
+        except Banned:
             ban_packet = build_packet(
-                packets.Packets.CLIENT_DISCONNECT,
+                packets.Packets.CONNECT_RESPONSE,
                 packets.connect_response().build(
                     Container(
                         success=False,