fix(client): Fix getByScriptId crashing the client

altmp · Dec 20, 2023 · 037bfc5 · 037bfc5
1 parent 2340530
commit 037bfc5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/client/src/classes/Object.cpp b/client/src/classes/Object.cpp
@@ -8,7 +8,8 @@ static void GetByScriptID(js::FunctionContext& ctx)
     uint32_t scriptId;
     if(!ctx.GetArg(0, scriptId)) return;
 
-    if (auto obj = alt::ICore::Instance().GetWorldObjectByScriptID(scriptId); obj->GetType() == alt::IBaseObject::Type::OBJECT)
+    auto obj = alt::ICore::Instance().GetWorldObjectByScriptID(scriptId);
+    if (obj &&  (obj->GetType() == alt::IBaseObject::Type::OBJECT || obj->GetType() == alt::IBaseObject::Type::LOCAL_OBJECT))
         return ctx.Return(obj);
 
     ctx.Return(nullptr);

diff --git a/client/src/classes/Ped.cpp b/client/src/classes/Ped.cpp
@@ -10,7 +10,7 @@ static void GetByScriptID(js::FunctionContext& ctx)
     if(!ctx.GetArg(0, scriptId)) return;
 
     auto obj = alt::ICore::Instance().GetWorldObjectByScriptID(scriptId);
-    if (obj->GetType() == alt::IBaseObject::Type::PED || obj->GetType() == alt::IBaseObject::Type::LOCAL_PED)
+    if (obj && (obj->GetType() == alt::IBaseObject::Type::PED || obj->GetType() == alt::IBaseObject::Type::LOCAL_PED))
         return ctx.Return(obj);
 
     ctx.Return(nullptr);

diff --git a/client/src/classes/Vehicle.cpp b/client/src/classes/Vehicle.cpp
@@ -17,7 +17,7 @@ static void GetByScriptID(js::FunctionContext& ctx)
     if(!ctx.GetArg(0, scriptId)) return;
 
     auto obj = alt::ICore::Instance().GetWorldObjectByScriptID(scriptId);
-    if (obj->GetType() == alt::IBaseObject::Type::VEHICLE || obj->GetType() == alt::IBaseObject::Type::LOCAL_VEHICLE)
+    if (obj && (obj->GetType() == alt::IBaseObject::Type::VEHICLE || obj->GetType() == alt::IBaseObject::Type::LOCAL_VEHICLE))
         return ctx.Return(obj);
 
     ctx.Return(nullptr);