Optimise Radar

1 files changed, 24 insertions, 16 deletions

diff --git a/plugins/radar.py b/plugins/radar.py
index cacc6c4..4695f06 100644
--- a/plugins/radar.py
+++ b/plugins/radar.py
@@ -9,7 +9,7 @@ import struct
 import traceback
 
 ENABLED = True
-RADIUS = 500 # in meters, within this range planes with different IFF can see each other on radar
+RADIUS = 5000 # in meters, within this range planes with different IFF can see each other.
 
 flying_players = {}
 
@@ -22,9 +22,19 @@ class Plugin:
         self.plugin_manager.register_hook('on_flight_data_server', self.on_flight_data_server)
         self.plugin_manager.register_hook('on_flight_data', self.on_flight_data)
         self.plugin_manager.register_hook('on_unjoin', self.on_unjoin)
+        #self.plugin_manager.register_hook('on_join_request', self.on_join)
+
+    """
+    def on_join(self, data, player, message_to_client, message_to_server):
+        flying_players[player.aircraft.id] = [player, []]
+        return True
+    """
 
     def on_flight_data(self, data, player, message_to_client, message_to_server):
-        flying_players[player.aircraft.id][1] = FSNETCMD_AIRPLANESTATE(data).position
+        try:
+            flying_players[player.aircraft.id][1] = FSNETCMD_AIRPLANESTATE(data).position
+        except KeyError:
+            return True
         return True
 
     def on_flight_data_server(self, data, player, message_to_client, message_to_server):
@@ -32,22 +42,23 @@ class Plugin:
         try:
             if player.aircraft.id not in flying_players and player.aircraft.id != -1:
                 flying_players[player.aircraft.id] = [player, []]
+                return True
             elif player.aircraft.id == -1:
                 return True
 
             decode = FSNETCMD_AIRPLANESTATE(data)
 
-            if decode.player_id == player.aircraft.id:
+            if len(flying_players[player.aircraft.id][1]) == 0:
                 return True
-            elif self.get_player_by_pilotid(int(decode.player_id)).iff == player.iff:
+            elif decode.player_id == player.aircraft.id:
+                return True
+            elif flying_players[decode.player_id][0].iff == player.iff:
                 return True
             elif self.in_range(flying_players[player.aircraft.id][1], decode.position):
-                print(flying_players[player.aircraft.id][1], decode.position)
-                print("HERE")
                 return True
             else:
                 try:
-                    position_data = struct.pack("3f", -1, 1000.0, 1000.0)
+                    position_data = struct.pack("3f", 10000, 1000.0, 1000.0)
                     if decode.packet_version == 4 or 5:
                         updated_data = data[:14] + position_data + data[26:]
                     else:
@@ -56,12 +67,16 @@ class Plugin:
                     traceback.print_exc()
 
                 player.streamWriterObject.write(send(updated_data))
-                player.streamWriterObject.drain()
+                # await player.streamWriterObject.drain()
                 return False
-        except:
+        except Exception as e:
+            if isinstance(e, KeyError):
+                return True
             traceback.print_exc()
 
     def on_unjoin(self, data, player, message_to_client, message_to_server):
+        if player.aircraft.id in flying_players:
+            flying_players.pop(player.aircraft.id)
         return True
 
     @staticmethod
@@ -69,10 +84,3 @@ class Plugin:
         # pos1 and pos2 are lists of [x,y,z]
         dist = math.sqrt((pos1[0] - pos2[0])**2 + (pos1[1] - pos2[1])**2 + (pos1[2] - pos2[2])**2)
         return dist <= RADIUS
-
-    @staticmethod
-    def get_player_by_pilotid(pilotid:int):
-        for playerid in flying_players:
-            if playerid == pilotid:
-                return flying_players[playerid][0]
-        return None