Further improvements after review

NexiusTailer · NexiusTailer · commit b237f7b60a03 · 2025-04-03T23:14:15.000+03:00
diff --git a/amx/server/natives/a_actors.lua b/amx/server/natives/a_actors.lua
@@ -36,12 +36,18 @@ function SetActorFacingAngle(amx, actor, ang)
 end
 
 function GetActorFacingAngle(amx, actor, refAng)
+	if not actor then
+		return false
+	end
 	local rX, rY, rZ = getElementRotation(actor)
 	writeMemFloat(amx, refAng, rZ)
 	return true
 end
 
 function GetActorPos(amx, actor, refX, refY, refZ)
+	if not actor then
+		return false
+	end
 	local x, y, z = getElementPosition(actor)
 	writeMemFloat(amx, refX, x)
 	writeMemFloat(amx, refY, y)
diff --git a/amx/server/natives/a_objects.lua b/amx/server/natives/a_objects.lua
@@ -39,6 +39,9 @@ function SetObjectPos(amx, object, x, y, z)
 end
 
 function GetObjectPos(amx, object, refX, refY, refZ)
+	if not object then
+		return false
+	end
 	local x, y, z = getElementPosition(object)
 	writeMemFloat(amx, refX, x)
 	writeMemFloat(amx, refY, y)
@@ -47,6 +50,9 @@ function GetObjectPos(amx, object, refX, refY, refZ)
 end
 
 function GetObjectRot(amx, object, refX, refY, refZ)
+	if not object then
+		return false
+	end
 	local rX, rX, rZ = getObjectRotation(object)
 	writeMemFloat(amx, refX, rX)
 	writeMemFloat(amx, refY, rY)
@@ -55,7 +61,8 @@ function GetObjectRot(amx, object, refX, refY, refZ)
 end
 
 function SetObjectRot(amx, object, rX, rY, rY)
-	return setObjectRotation(object, rX, rY, rZ)
+	setObjectRotation(object, rX, rY, rZ)
+	return true
 end
 
 function GetObjectModel(amx, objID)
@@ -84,7 +91,7 @@ function MoveObject(amx, object, x, y, z, speed)
 	local time = distance/speed*1000
 	moveObject(object, time, x, y, z, 0, 0, 0)
 	setTimer(procCallOnAll, time, 1, 'OnObjectMoved', getElemID(object))
-	return true
+	return math.floor(time)
 end
 
 function StopObject(amx, object)
@@ -157,7 +164,7 @@ end
 function GetPlayerObjectPos(amx, player, objID, refX, refY, refZ)
 	local x, y, z = getPlayerObjectPos(amx, player, objID)
 	if not x then
-		return
+		return false
 	end
 	writeMemFloat(amx, refX, x)
 	writeMemFloat(amx, refY, y)
@@ -168,7 +175,7 @@ end
 function GetPlayerObjectRot(amx, player, objID, refX, refY, refZ)
 	local obj = g_PlayerObjects[player] and g_PlayerObjects[player][objID]
 	if not obj then
-		return
+		return false
 	end
 	writeMemFloat(amx, refX, obj.rx)
 	writeMemFloat(amx, refY, obj.ry)
@@ -204,7 +211,7 @@ function MovePlayerObject(amx, player, objID, x, y, z, speed)
 	local timer = setTimer(procCallOnAll, duration, 1, 'OnPlayerObjectMoved', getElemID(player), objID)
 	obj.moving = { x = x, y = y, z = z, starttick = getTickCount(), duration = duration, timer = timer }
 	clientCall(player, 'MovePlayerObject', objID, x, y, z, speed)
-	return true
+	return math.floor(duration)
 end
 
 function StopPlayerObject(amx, player, objID)
diff --git a/amx/server/natives/a_players.lua b/amx/server/natives/a_players.lua
@@ -6,6 +6,9 @@ function SetPlayerFacingAngle(amx, player, angle)
 	return setPedRotation(player, angle)
 end
 function GetPlayerFacingAngle(amx, player, refRot)
+	if not player then
+		return false
+	end
 	writeMemFloat(amx, refRot, getPedRotation(player))
 	return true
 end
@@ -42,6 +45,9 @@ function SetPlayerHealth(amx, player, health)
 end
 
 function GetPlayerHealth(amx, player, refHealth)
+	if not player then
+		return false
+	end
 	writeMemFloat(amx, refHealth, getElementHealth(player))
 	return true
 end
@@ -51,6 +57,9 @@ function SetPlayerArmour(amx, player, armor)
 end
 
 function GetPlayerArmour(amx, player, refArmor)
+	if not player then
+		return false
+	end
 	writeMemFloat(amx, refArmor, getPedArmor(player))
 	return true
 end
@@ -186,9 +195,13 @@ function GetPlayerState(amx, player)
 end
 
 function GetPlayerIp(amx, player, refName, len)
+	if not player then
+		return -1
+	end
 	local ip = getPlayerIP(player)
 	if #ip < len then
 		writeMemString(amx, refName, ip)
+		return string.len(ip)
 	end
 end
 
@@ -211,6 +224,7 @@ function GetPlayerName(amx, player, nameBuf, bufSize)
 	local name = getPlayerName(player)
 	if #name <= bufSize then
 		writeMemString(amx, nameBuf, name)
+		return string.len(name)
 	end
 end
 
@@ -261,6 +275,9 @@ function SetPlayerVelocity(amx, player, vx, vy, vz)
 end
 
 function GetPlayerVelocity(amx, player, refVX, refVY, refVZ)
+	if not player then
+		return false
+	end
 	local vx, vy, vz = getElementVelocity(player)
 	writeMemFloat(amx, refVX, vx)
 	writeMemFloat(amx, refVY, vy)
@@ -697,15 +714,19 @@ function GetAnimationName(amx)
 end
 
 function GetPlayerSpecialAction(amx, player)
-	if isPedWearingJetpack(player) then
+	if not player then
+		return SPECIAL_ACTION_NONE
+	elseif isPedWearingJetpack(player) then
 		return SPECIAL_ACTION_USEJETPACK
 	else
 		return g_Players[getElemID(player)].specialaction or SPECIAL_ACTION_NONE
 	end
 end
 
 function SetPlayerSpecialAction(amx, player, actionID)
-	if actionID == SPECIAL_ACTION_NONE then
+	if not player then
+		return false
+	elseif actionID == SPECIAL_ACTION_NONE then
 		setPedWearingJetpack(player, false)
 		setPedAnimation(player, false)
 	elseif actionID == SPECIAL_ACTION_USEJETPACK then
@@ -763,12 +784,18 @@ function AllowPlayerTeleport(amx, player, allow)
 end
 
 function SetPlayerCameraPos(amx, player, x, y, z)
+	if not player then
+		return false
+	end
 	fadeCamera(player, true)
 	setCameraMatrix(player, x, y, z)
 	return true
 end
 
 function SetPlayerCameraLookAt(amx, player, lx, ly, lz)
+	if not player then
+		return false
+	end
 	fadeCamera(player, true)
 	local x, y, z = getCameraMatrix(player)
 	setCameraMatrix(player, x, y, z, lx, ly, lz)
@@ -782,6 +809,9 @@ function SetCameraBehindPlayer(amx, player)
 end
 
 function GetPlayerCameraPos(amx, player, refX, refY, refZ)
+	if not player then
+		return false
+	end
 	local x, y, z = getCameraMatrix(player)
 	writeMemFloat(amx, refX, x)
 	writeMemFloat(amx, refY, y)
@@ -790,6 +820,9 @@ function GetPlayerCameraPos(amx, player, refX, refY, refZ)
 end
 
 function GetPlayerCameraFrontVector(amx, player, refX, refY, refZ)
+	if not player then
+		return false
+	end
 	local x, y, z, lx, ly, lz = getCameraMatrix(player)
 	writeMemFloat(amx, refX, lx)
 	writeMemFloat(amx, refY, ly)
@@ -829,12 +862,12 @@ end
 
 function GetPlayerCameraAspectRatio(amx)
 	notImplemented('GetPlayerCameraAspectRatio')
-	return false
+	return float2cell(0.0)
 end
 
 function GetPlayerCameraZoom(amx)
 	notImplemented('GetPlayerCameraZoom')
-	return false
+	return float2cell(0.0)
 end
 
 function AttachCameraToObject(amx, player, object)
diff --git a/amx/server/natives/a_samp.lua b/amx/server/natives/a_samp.lua
@@ -985,6 +985,7 @@ function gpci(amx, player, nameBuf, bufSize)
 	local serial = getPlayerSerial(player)
 	if #serial <= bufSize then
 		writeMemString(amx, nameBuf, serial)
+		return string.len(serial)
 	end
 end
 
@@ -1019,7 +1020,7 @@ function NetStats_GetIpPort(amx, player, ip_port, ip_port_len)
 	local port = 0 -- We haven't a solution for getting a client port
 	local ipandport = tostring(ip).. ":".. tostring(port)
 	writeMemString(amx, ip_port, ipandport)
-	return string.len(tostring(ip).. ":".. tostring(port));
+	return string.len(ipandport);
 end
 
 function NetStats_MessagesReceived(amx, player)
diff --git a/amx/server/natives/a_vehicles.lua b/amx/server/natives/a_vehicles.lua
@@ -20,6 +20,9 @@ GetVehiclePos = GetObjectPos
 SetVehiclePos = SetObjectPos
 
 function GetVehicleZAngle(amx, vehicle, refZ)
+	if not vehicle then
+		return false
+	end
 	local rX, rY, rZ = getVehicleRotation(vehicle)
 	writeMemFloat(amx, refZ, rZ)
 	return true
@@ -156,6 +159,9 @@ function SetVehicleHealth(amx, vehicle, health)
 end
 
 function GetVehicleHealth(amx, vehicle, refHealth)
+	if not vehicle then
+		return false
+	end
 	writeMemFloat(amx, refHealth, getElementHealth(vehicle))
 	return true
 end
@@ -241,6 +247,9 @@ function RepairVehicle(amx, vehicle)
 end
 
 function GetVehicleVelocity(amx, vehicle, refVX, refVY, refVZ)
+	if not vehicle then
+		return false
+	end
 	local vx, vy, vz = getElementVelocity(vehicle)
 	writeMemFloat(amx, refVX, vx)
 	writeMemFloat(amx, refVY, vy)
