Merge pull request Blumlaut#905 from Gravxd/master

fix: Spectating multiple players can cause error + validate targets of spectate/tp better

Author: Blumlaut

client/admin_client.lua

@@ -189,31 +189,25 @@ RegisterNetEvent("EasyAdmin:requestSpectate", function(playerServerId, playerDat
 	local tgtCoords = playerData.coords
 
 	if ((not tgtCoords) or (tgtCoords.z == 0.0)) then tgtCoords = GetEntityCoords(GetPlayerPed(GetPlayerFromServerId(playerServerId))) end
-	if playerServerId == GetPlayerServerId(PlayerId()) then 
-		if oldCoords then
-			RequestCollisionAtCoord(oldCoords.x, oldCoords.y, oldCoords.z)
-			Wait(500)
-			SetEntityCoords(playerPed, oldCoords.x, oldCoords.y, oldCoords.z, 0, 0, 0, false)
-			oldCoords=nil
-		end
-		spectatePlayer(localPlayerPed,GetPlayerFromServerId(PlayerId()),GetPlayerName(PlayerId()))
-		frozen = false
-		FreezeMyself(false)
-		return 
-	else
-		if not oldCoords then
-			oldCoords = GetEntityCoords(PlayerPedId())
-		end
+	
+	if not IsSpectating then
+		oldCoords = GetEntityCoords(PlayerPedId())
 	end
+
 	SetEntityCoords(localPlayerPed, tgtCoords.x, tgtCoords.y, tgtCoords.z - 10.0, 0, 0, 0, false)
 	frozen = true
 	FreezeMyself(true)
 	stopSpectateUpdate = true
 	local playerId = GetPlayerFromServerId(playerServerId)
+	local timer = 0
 	repeat
 		Wait(200)
 		playerId = GetPlayerFromServerId(playerServerId)
-	until ((GetPlayerPed(playerId) > 0) and (playerId ~= -1))
+		timer = timer + 1
+	until ( (GetPlayerPed(playerId) > 0) and (playerId ~= -1) or timer > 25)
+	if timer >= 25 then
+		return
+	end
 	spectatePlayer(GetPlayerPed(playerId),playerId,GetPlayerName(playerId))
 	stopSpectateUpdate = false 
 end)
@@ -388,7 +382,7 @@ function spectatePlayer(targetPed,target,name)
 		SetEntityCollision(playerPed, false, false)
 		SetEntityInvincible(playerPed, true)
 		NetworkSetEntityInvisibleToNetwork(playerPed, true)
-		Citizen.Wait(200) -- to prevent target player seeing you
+		Wait(200) -- to prevent target player seeing you
 		if targetPed == playerPed then
 			Wait(500)
 			targetPed = GetPlayerPed(target)
@@ -404,14 +398,13 @@ function spectatePlayer(targetPed,target,name)
 			RequestCollisionAtCoord(oldCoords.x, oldCoords.y, oldCoords.z)
 			Wait(500)
 			SetEntityCoords(playerPed, oldCoords.x, oldCoords.y, oldCoords.z, 0, 0, 0, false)
-			oldCoords=nil
 		end
 		NetworkSetInSpectatorMode(false, targetPed)
 		StopDrawPlayerInfo()
 		TriggerEvent("EasyAdmin:showNotification", GetLocalisedText("stoppedSpectating"))
 		frozen = false
 		FreezeMyself(false)
-		Citizen.Wait(200) -- to prevent staying invisible
+		Wait(200) -- to prevent staying invisible
 		SetEntityVisible(playerPed, true, 0)
 		SetEntityCollision(playerPed, true, true)
 		SetEntityInvincible(playerPed, false)

server/admin_server.lua

@@ -323,7 +323,24 @@ Citizen.CreateThread(function()
 		if DoesPlayerHavePermission(source, "player.spectate") and CheckAdminCooldown(source, "spectate") then
 			SetAdminCooldown(source, "spectate")
 			PrintDebugMessage("Player "..getName(source,true).." Requested Spectate to "..getName(playerId,true), 3)
-			local tgtCoords = GetEntityCoords(GetPlayerPed(playerId))
+			local tgtPed = GetPlayerPed(playerId)
+			if tgtPed == 0 then
+				-- ped does not exist left or not loaded in yet
+				TriggerClientEvent("EasyAdmin:showNotification", source, GetLocalisedText("playernotfound"))
+				return
+			end
+
+			if playerId == source then
+				return
+			end
+
+			local tgtCoords = GetEntityCoords(tgtPed)
+			if tgtCoords.x == 0.00 and tgtCoords.y == 0.00 then
+				-- loaded in but still spawning
+				TriggerClientEvent("EasyAdmin:showNotification", source, GetLocalisedText("playernotfound"))
+				return
+			end
+
 			local playerBucket = GetPlayerRoutingBucket(playerId)
 			local sourceBucket = GetPlayerRoutingBucket(source)
 			if sourceBucket ~= playerBucket then
@@ -484,11 +501,25 @@ Citizen.CreateThread(function()
 		if not CachedPlayers[id].dropped and DoesPlayerHavePermission(source, "player.teleport.single") and CheckAdminCooldown(source, "teleport") then
 			SetAdminCooldown(source, "teleport")
 			local tgtPed = GetPlayerPed(id)
+			if tgtPed == 0 then
+				-- ped does not exist left or not loaded in yet
+				TriggerClientEvent("EasyAdmin:showNotification", source, GetLocalisedText("playernotfound"))
+				return
+			end
+			if id == source then
+				return
+			end
 			local tgtCoords = GetEntityCoords(tgtPed)
+			if tgtCoords.x == 0.00 and tgtCoords.y == 0.00 then
+				-- loaded in but still spawning
+				TriggerClientEvent("EasyAdmin:showNotification", source, GetLocalisedText("playernotfound"))
+				return
+			end
 			local preferredWebhook = detailNotification ~= "false" and detailNotification or moderationNotification
 			SendWebhookMessage(preferredWebhook,string.format(GetLocalisedText("teleportedtoplayer"), getName(source, false, true), getName(id, true, true)), "teleport", 16777214)
 			TriggerClientEvent('EasyAdmin:TeleportRequest', source, id,tgtCoords)
 		else
+			TriggerClientEvent("EasyAdmin:showNotification", source, GetLocalisedText("playernotfound"))
 			PrintDebugMessage('EASYADMIN FAILED TO TELEPORT'..source..' TO ID: '..id, 2)
 		end
 	end)