Skip to content

fix(client): prevent native crash in RaycastCamera #216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NebelRebell wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(client): prevent native crash in RaycastCamera #216

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 73 additions & 22 deletions client.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,36 +100,87 @@ local function DrawTarget()
end)
end

local function RaycastCamera(flag, playerCoords)
if not playerPed then playerPed = PlayerPedId() end
if not playerCoords then playerCoords = GetEntityCoords(playerPed) end
---NEBELBANK.net fix RaycastCamera-Error
-- local function RaycastCamera(flag, playerCoords)
-- if not playerPed then playerPed = PlayerPedId() end
-- if not playerCoords then playerCoords = GetEntityCoords(playerPed) end

local rayPos, rayDir = ScreenPositionToCameraRay()
local destination = rayPos + 16 * rayDir
local rayHandle = StartShapeTestLosProbe(rayPos.x, rayPos.y, rayPos.z, destination.x, destination.y, destination.z,
flag or -1, playerPed, 4)
-- local rayPos, rayDir = ScreenPositionToCameraRay()
-- local destination = rayPos + 16 * rayDir
-- local rayHandle = StartShapeTestLosProbe(rayPos.x, rayPos.y, rayPos.z, destination.x, destination.y, destination.z,
-- flag or -1, playerPed, 4)

while true do
local result, _, endCoords, _, entityHit = GetShapeTestResult(rayHandle)
-- while true do
-- local result, _, endCoords, _, entityHit = GetShapeTestResult(rayHandle)

if result ~= 1 then
local distance = playerCoords and #(playerCoords - endCoords)
-- if result ~= 1 then
-- local distance = playerCoords and #(playerCoords - endCoords)

if flag == 30 and entityHit then
entityHit = HasEntityClearLosToEntity(entityHit, playerPed, 7) and entityHit
end
-- if flag == 30 and entityHit then
-- entityHit = HasEntityClearLosToEntity(entityHit, playerPed, 7) and entityHit
-- end

local entityType = entityHit and GetEntityType(entityHit)
-- local entityType = entityHit and GetEntityType(entityHit)

if entityType == 0 and pcall(GetEntityModel, entityHit) then
entityType = 3
end
-- if entityType == 0 and pcall(GetEntityModel, entityHit) then
-- entityType = 3
-- end

return endCoords, distance, entityHit, entityType or 0
end
-- return endCoords, distance, entityHit, entityType or 0
-- end

Wait(0)
end
-- Wait(0)
-- end
-- end
local function RaycastCamera(flag, playerCoords)
-- Caching für Performance und Sicherheit
local DoesEntityExist = DoesEntityExist
local GetEntityType = GetEntityType

if not playerPed then playerPed = PlayerPedId() end
if not playerCoords then playerCoords = GetEntityCoords(playerPed) end

local rayPos, rayDir = ScreenPositionToCameraRay()
local destination = rayPos + 16 * rayDir
-- Wir nutzen hier 4 für p4 (den Flag für 'peds'), aber der 'flag' Parameter steuert die Kollision
local rayHandle = StartShapeTestLosProbe(rayPos.x, rayPos.y, rayPos.z, destination.x, destination.y, destination.z,
flag or -1, playerPed, 4)

while true do
local result, _, endCoords, _, entityHit = GetShapeTestResult(rayHandle)

if result ~= 1 then -- ShapeTest ist fertig
local distance = #(playerCoords - endCoords)

-- 1. SÄULE: Existenz-Check (Verhindert den Native-Crash)
if not entityHit or entityHit == 0 or entityHit == -1 or not DoesEntityExist(entityHit) then
return endCoords, distance, 0, 0
end

-- 2. SÄULE: LOS Check (Nur wenn flag 30 und sichergestellt ist, dass entityHit valide ist)
if flag == 30 then
-- Wichtig: Parameter-Reihenfolge bei HasEntityClearLosToEntity beachten
if not HasEntityClearLosToEntity(playerPed, entityHit, 7) then
return endCoords, distance, 0, 0
end
end

-- 3. SÄULE: Typ-Bestimmung
local entityType = GetEntityType(entityHit) or 0

-- Fallback für Objekte, falls GetEntityType 0 liefert (häufig bei MLOs/Map-Objekten)
if entityType == 0 then
local ok = pcall(GetEntityModel, entityHit)
if ok then
entityType = 3 -- Markiere als Objekt
end
end

return endCoords, distance, entityHit, entityType
end

Wait(0) -- Verhindert das Einfrieren des Threads während des Raycasts
end
end

exports('RaycastCamera', RaycastCamera)
Expand Down
Loading