Don't spam OnVehicleDeath events, fix SpawnPlayer so a samp workaround to skip the selection screen works, fix GetActorFacingAngle, add GetActorPos, handle vehicle leave events when a vehicle is destroyed by other means such as a command, add 'debug' client command to toggle debug view.

Author: colistro123

amx/client/client.lua

@@ -45,6 +45,7 @@ addEventHandler('onClientResourceStart', resourceRoot,
 	function()
 		triggerServerEvent('onLoadedAtClient', resourceRoot, localPlayer)
 		setTimer(checkTextLabels, 500, 0)
+		setDebugViewActive(true)
 	end,
 	false
 )
@@ -56,6 +57,12 @@ addEventHandler('onClientResourceStop', resourceRoot,
 	false
 )
 
+function enableDebug()
+	local state = not isDebugViewActive()
+	setDebugViewActive(state)
+end
+addCommandHandler("debug", enableDebug)
+
 function setAMXVersion(ver)
 	g_AMXVersion = ver
 end

amx/client/util.lua

@@ -66,8 +66,6 @@ function serverAMXEvent(eventName, ...)
 	server.procCallOnAll(eventName, ...)
 end
 
-setDebugViewActive(true)
-
 function drawBorderText(text, x, y, color, scalex, scaley, font, outlinesize, outlinecolor)
 	local alpha = math.floor(color / 16777216)
 	outlinesize = outlinesize or 2

amx/server/events.lua

@@ -258,7 +258,7 @@ addEventHandler('onPlayerSpawn', root,
 	function()
 		local playerID = getElemID(source)
 		local playerdata = g_Players[playerID]
-		if playerdata.doingclasssel or playerdata.beingremovedfromvehicle or playerdata.spawnedfromgamemodeinit then
+		if playerdata.doingclasssel or playerdata.spawnedfromgamemodeinit then
 			if playerdata.spawnedfromgamemodeinit ~= nil then
 				playerdata.spawnedfromgamemodeinit = nil
 			end
@@ -380,6 +380,24 @@ addEventHandler('onPlayerQuit', root,
 -------------------------------
 -- Vehicles
 
+addEventHandler('onResourceStart', resourceRoot,
+	function()
+		setTimer ( checkIfLeftVehicleByOtherMeans, 1000, 0 )
+	end,
+	false
+)
+
+function checkIfLeftVehicleByOtherMeans() --If the player is slapped, or the vehicle is destroyed by a command, we need to handle such
+	for i, data in pairs(g_Players) do
+		local state = getPlayerState(data.elem)
+		if state == PLAYER_STATE_DRIVER or state == PLAYER_STATE_PASSENGER then
+			if not isPedInVehicle(data.elem) then
+				setPlayerState(data.elem, PLAYER_STATE_ONFOOT)
+			end
+		end
+	end
+end
+
 function respawnStaticVehicle(vehicle)
 	if not isElement(vehicle) then
 		return
@@ -392,6 +410,7 @@ function respawnStaticVehicle(vehicle)
 		killTimer(g_Vehicles[vehID].respawntimer)
 	end
 	g_Vehicles[vehID].respawntimer = nil
+	g_Vehicles[vehID].vehicleIsAlive = true
 	local spawninfo = g_Vehicles[vehID].spawninfo
 	spawnVehicle(vehicle, spawninfo.x, spawninfo.y, spawninfo.z, 0, 0, spawninfo.angle)
 	procCallInternal(amx, 'OnVehicleSpawn', vehID)
@@ -442,14 +461,12 @@ addEventHandler('onVehicleStartEnter', root,
 addEventHandler('onVehicleExit', root,
 	function(player, seat, jacker)
 		local vehID = getElemID(source)
-
 		if isPed(player) then
 			local pedID = getElemID(player)
 			g_Bots[pedID].vehicle = nil
 			setBotState(player, PLAYER_STATE_ONFOOT)
 			return
 		end
-
 		local playerID = getElemID(player)
 		g_Players[playerID].vehicle = nil
 		setPlayerState(player, PLAYER_STATE_ONFOOT)
@@ -494,13 +511,18 @@ addEventHandler('onVehicleExplode', root,
 	function()
 		local vehID = getElemID(source)
 
-		procCallOnAll('OnVehicleDeath', vehID, 0)		-- NOES, MY VEHICLE DIED
+		--So the OnVehicleDeath event only gets called once
+		if g_Vehicles[vehID] and g_Vehicles[vehID].vehicleIsAlive then
+			procCallOnAll('OnVehicleDeath', vehID, 0)		-- NOES, MY VEHICLE DIED
 
-		if g_Vehicles[vehID] and g_Vehicles[vehID].respawntimer then
-			killTimer(g_Vehicles[vehID].respawntimer)
-			g_Vehicles[vehID].respawntimer = nil
+			if g_Vehicles[vehID].respawntimer then
+				killTimer(g_Vehicles[vehID].respawntimer)
+				g_Vehicles[vehID].respawntimer = nil
+			end
+
+			g_Vehicles[vehID].vehicleIsAlive = false
+			g_Vehicles[vehID].respawntimer = setTimer(respawnStaticVehicle, g_Vehicles[vehID].respawndelay, 1, source)
 		end
-		g_Vehicles[vehID].respawntimer = setTimer(respawnStaticVehicle, g_Vehicles[vehID].respawndelay, 1, source)
 	end
 )
 

amx/server/natives/a_actors.lua

@@ -34,10 +34,17 @@ function SetActorFacingAngle(amx, actor, ang)
 end
 
 function GetActorFacingAngle(amx, actor, refAng)
-	local rX, rY, rZ = getElementRotation(vehicle)
+	local rX, rY, rZ = getElementRotation(actor)
 	writeMemFloat(amx, refAng, rZ)
 end
 
+function GetActorPos(amx, actor, refX, refY, refZ)
+	local x, y, z = getElementPosition(actor)
+	writeMemFloat(amx, refX, x)
+	writeMemFloat(amx, refY, y)
+	writeMemFloat(amx, refZ, z)
+end
+
 -- stub
 function SetActorInvulnerable(amx)
 	notImplemented('SetActorInvulnerable')

amx/server/natives/a_samp.lua

@@ -305,6 +305,7 @@ function AddStaticVehicleEx(amx, model, x, y, z, angle, color1, color2, respawnD
 	if respawnDelay < 0 then
 		respawnDelay = 120
 	end
+	g_Vehicles[vehID].vehicleIsAlive = true
 	g_Vehicles[vehID].respawndelay = respawnDelay*1000
 	g_Vehicles[vehID].spawninfo = { x = x, y = y, z = z, angle = angle }
 	if ManualVehEngineAndLights then
@@ -499,8 +500,9 @@ function SendRconCommand(amx, command)
 	print(doRCON(command))
 end
 
+--Call requestSpawn instead so we clear up any binds (since there's a workaround in SA-MP to skip the spawn selection screen, and I use this workaround)
 function SpawnPlayer(amx, player)
-	spawnPlayerBySelectedClass(player)
+	requestSpawn(player, false, false)
 end
 
 -- GetPlayerNetworkStats

amx/server/natives/a_vehicles.lua

@@ -114,8 +114,7 @@ function SetVehicleToRespawn(amx, vehicle)
 			removePedFromVehicle(player)
 		end
 	end
-	local spawninfo = g_Vehicles[getElemID(vehicle)].spawninfo
-	spawnVehicle(vehicle, spawninfo.x, spawninfo.y, spawninfo.z, 0, 0, spawninfo.angle)
+	respawnStaticVehicle(vehicle)
 end
 
 function LinkVehicleToInterior(amx, vehicle, interior)

amx/server/syscalls.lua

@@ -755,7 +755,6 @@ g_SAMPSyscallPrototypes = {
 	SetPlayerDrunkLevel = {'p', 'i'},
 	SelectTextDraw = {'p', 'x'},
   	CancelSelectTextDraw = {'p'},
-	GetActorPos = {'i', 'r', 'r', 'r'}, --r since the vals should be passed by ref
 	GetPVarsUpperIndex = {'p'},
   	GetPVarNameAtIndex = {'p', 'i', 'r', 'i'},
 	SetVehicleParamsCarWindows = {'v', 'i', 'i', 'i', 'i'},
@@ -794,6 +793,7 @@ g_SAMPSyscallPrototypes = {
 	SetActorFacingAngle = {'y', 'f'},
 	SetActorHealth = {'y', 'f'},
 	SetActorInvulnerable = {},
+	GetActorPos = {'y', 'r', 'r', 'r'}, --r since the vals should be passed by ref
 	SetActorPos = {'y', 'f', 'f', 'f'},
 	SetActorVirtualWorld = {'y', 'i'},