Fix teleport to Player

Author: prikolium-cfx

vMenu/CommonFunctions.cs

@@ -423,6 +423,11 @@ public static async Task TeleportToPlayer(IPlayer player, bool inVehicle = false
                 else
                 {
                     playerPos = await MainMenu.RequestPlayerCoordinates(player.ServerId);
+                    if (playerPos == Vector3.Zero)
+                    {
+                        Notify.Error("Could not retrieve the coordinates of the specified player. Teleport cancelled.");
+                        return;
+                    }
                     wasActive = false;
                 }
 

vMenu/MainMenu.cs

@@ -369,26 +369,46 @@ public void ReceivedPlayerList(IList<object> players)
             PlayersList?.ReceivedPlayerList(players);
         }
 
-        public static async Task<Vector3> RequestPlayerCoordinates(int serverId)
+        struct RPCData
         {
-            var coords = Vector3.Zero;
-            var completed = false;
+            public bool IsCompleted { get; set; }
+            public Vector3 Coords { get; set; }
+        }
 
-            // TODO: replace with client<->server RPC once implemented in CitizenFX!
-            Func<Vector3, bool> CallbackFunction = (data) =>
+        private static Dictionary<long, RPCData> rpcQueue = new Dictionary<long, RPCData>();
+        private static long rpcIdCounter = 0;
+
+        [EventHandler("vMenu:GetPlayerCoords:reply")]
+        public static void PlayerCoordinatesReceived(long rpcId, Vector3 coords)
+        {
+            if (rpcQueue.ContainsKey(rpcId))
             {
-                coords = data;
-                completed = true;
-                return true;
-            };
+                var rpcItem = rpcQueue[rpcId];
+                rpcItem.IsCompleted = true;
+                rpcItem.Coords = coords;
+                rpcQueue[rpcId] = rpcItem;
+            }
+            else
+            {
+                Debug.WriteLine($"[vMenu] Warning: Received player coordinates for unknown RPC ID: {rpcId}");
+            }
+        }
 
-            TriggerServerEvent("vMenu:GetPlayerCoords", serverId, CallbackFunction);
+        public static async Task<Vector3> RequestPlayerCoordinates(int serverId)
+        {
+            long rpcId = rpcIdCounter++;
+            rpcQueue.Add(rpcId, new RPCData { IsCompleted = false, Coords = Vector3.Zero });
+
+            TriggerServerEvent("vMenu:GetPlayerCoords", rpcId, serverId);
 
-            while (!completed)
+            while (!rpcQueue[rpcId].IsCompleted)
             {
                 await Delay(0);
             }
 
+            Vector3 coords = rpcQueue[rpcId].Coords;
+            rpcQueue.Remove(rpcId);
+
             return coords;
         }
         #endregion

vMenuServer/MainServer.cs

@@ -912,19 +912,15 @@ internal void RequestPlayerListFromPlayer([FromSource] Player player)
         }
 
         [EventHandler("vMenu:GetPlayerCoords")]
-        internal void GetPlayerCoords([FromSource] Player source, int playerId, NetworkCallbackDelegate callback)
+        internal void GetPlayerCoords([FromSource] Player source, long rpcId, int playerId, NetworkCallbackDelegate callback)
         {
+            var coords = Vector3.Zero;
             if (IsPlayerAceAllowed(source.Handle, "vMenu.OnlinePlayers.Teleport") || IsPlayerAceAllowed(source.Handle, "vMenu.Everything") ||
                 IsPlayerAceAllowed(source.Handle, "vMenu.OnlinePlayers.All"))
             {
-                var coords = Players[playerId]?.Character?.Position ?? Vector3.Zero;
-
-                _ = callback(coords);
-
-                return;
+                coords = Players[playerId]?.Character?.Position ?? Vector3.Zero;
             }
-
-            _ = callback(Vector3.Zero);
+            source.TriggerEvent("vMenu:GetPlayerCoords:reply", rpcId, coords);
         }
         #endregion