Make refuel plugin optimised

1 files changed, 34 insertions, 25 deletions

diff --git a/plugins/refuel.py b/plugins/refuel.py
index 12af66a..ff96699 100644
--- a/plugins/refuel.py
+++ b/plugins/refuel.py
@@ -4,6 +4,7 @@ This plugin enables you to perform air to air refueling.
 import math
 from lib.PacketManager.packets import FSNETCMD_AIRCMD, FSNETCMD_AIRPLANESTATE
 from lib import YSchat
+import asyncio
 
 ENABLED = True
 REFUEL_RADIUS = 500
@@ -52,7 +53,31 @@ class Plugin:
         message_to_client.append(a)
 
     def on_flight_data(self, data, player, message_to_client, message_to_server):
+        asyncio.create_task(self.refuel_logic(data, player))
+        return True
+
+    def on_unjoin(self, data, player, message_to_client, message_to_server):
+        if player in refuelers:
+            refuelers.pop(player)
+        elif player in refueling:
+            refueling.pop(player)
+        return True
+
+    @staticmethod
+    def in_range(refueler_cord:list, refueled_cord:list):
+        # the plane to be refueled must be below and behind the
+        # refueler plane, ysf sends cords in list[x, y, z]
+        # implement this later
+        # for now we just use distance formula in a 3d space
+        dist = math.sqrt((refueler_cord[0]-refueled_cord[0])**2 + (refueler_cord[1]-refueled_cord[1])**2 + (refueler_cord[2]-refueled_cord[2])**2)
+        if dist < REFUEL_RADIUS:
+            return True
+        else:
+            return False
+
+    async def refuel_logic(self, data, player):
         decode = FSNETCMD_AIRPLANESTATE(data)
+        k = player.streamWriterObject
         if player in refueling:
             for refueler in refuelers:
                 if refueler.iff == player.iff:
@@ -61,16 +86,19 @@ class Plugin:
                         refuelers[refueler][2] = True
                         max_lim = int((player.aircraft.initial_config['WEIGFUEL'])[:-2])
                         if decode.fuel < max_lim:
-                            a = FSNETCMD_AIRCMD.set_command(player.aircraft.id, "INITFUEL", f"{decode.fuel+FUEL_RATE}kg", True)
-                            message_to_client.append(a)
+                            #a = FSNETCMD_AIRCMD.set_command(player.aircraft.id, "INITFUEL", f"{decode.fuel+FUEL_RATE}kg", True)
+                            #message_to_client.append(a)
+                            k.write(FSNETCMD_AIRCMD.set_command(player.aircraft.id, "INITFUEL", f"{decode.fuel+FUEL_RATE}kg", True))
                         elif decode.fuel >= max_lim:
                             a = YSchat.message("The plane is full!")
                             refuelers[refueler][2] = False # No longer refueling
-                            message_to_client.append(a)
+                            k.write(a)
+                            #message_to_client.append(a)
 
                         if refuelers[refueler][0] < FUEL_RATE:
                             a = YSchat.message("The refueler ran out of fuel!")
-                            message_to_client.append(a)
+                            k.write(a)
+                            #message_to_client.append(a)
                     else:
                         refuelers[refueler][2] = False # No longer refueling
 
@@ -79,24 +107,5 @@ class Plugin:
             refuelers[player] = [decode.fuel, decode.position, refuelers[player][2]]
             if decode.fuel-FUEL_RATE > 0 and refuelers[player][2]:
                 a = FSNETCMD_AIRCMD.set_command(player.aircraft.id, "INITFUEL", f"{decode.fuel-FUEL_RATE}kg", True)
-                message_to_client.append(a)
-        return True
-
-    def on_unjoin(self, data, player, message_to_client, message_to_server):
-        if player in refuelers:
-            refuelers.pop(player)
-        elif player in refueling:
-            refueling.pop(player)
-        return True
-
-    @staticmethod
-    def in_range(refueler_cord:list, refueled_cord:list):
-        # the plane to be refueled must be below and behind the
-        # refueler plane, ysf sends cords in list[x, y, z]
-        # implement this later
-        # for now we just use distance formula in a 3d space
-        dist = math.sqrt((refueler_cord[0]-refueled_cord[0])**2 + (refueler_cord[1]-refueled_cord[1])**2 + (refueler_cord[2]-refueled_cord[2])**2)
-        if dist < REFUEL_RADIUS:
-            return True
-        else:
-            return False
+                #message_to_client.append(a)
+                k.write(a)