From 2ad1f4669c30e482ff7e304464607852c09e1b08 Mon Sep 17 00:00:00 2001 From: "Mr.Crowley" Date: Thu, 24 Jul 2025 05:03:07 -0500 Subject: [PATCH] small update target got a print if onSelect or action are nil also added groups in fixoptions for sleepless client entities using return for loadmodel --- lib/entities/client/client_entity.lua | 6 +++--- lib/utility/client/utility.lua | 5 ++--- modules/target/ox_target/client.lua | 16 ++++++++++------ modules/target/sleepless_interact/client.lua | 1 + 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/lib/entities/client/client_entity.lua b/lib/entities/client/client_entity.lua index c6e5de1..55de714 100644 --- a/lib/entities/client/client_entity.lua +++ b/lib/entities/client/client_entity.lua @@ -12,15 +12,15 @@ local function SpawnEntity(entityData) -- for k, v in pairs(entityData.args) do -- print(string.format("SpawnEntity %s: %s", k, v)) -- end - local model = entityData.model and type(entityData.model) == 'string' and GetHashKey(entityData.model) or entityData.model - if model and not Utility.LoadModel(model) then + local loaded, model = Utility.GetModel(entityData.model) + if not loaded then print(string.format("[ClientEntity] Failed to load model %s for entity %s", entityData.model, entityData.id)) return end local entity = nil local coords = entityData.coords - local rotation = entityData.rotation or vector3(0.0, 0.0, 0.0) -- Default rotation if not provided + local rotation = entityData.rotation or vector3(0.0, 0.0, entityData.heading or 0.0) -- Default rotation if not provided if entityData.entityType == 'object' then entity = CreateObject(model, coords.x, coords.y, coords.z, false, false, false) diff --git a/lib/utility/client/utility.lua b/lib/utility/client/utility.lua index 6e5a3f8..5b41346 100644 --- a/lib/utility/client/utility.lua +++ b/lib/utility/client/utility.lua @@ -226,10 +226,9 @@ end ---Load a model into memory ---@param model string|number ----@return boolean +---@return boolean, number function Utility.LoadModel(model) - local loaded = ensureModelLoaded(model) - return loaded + return ensureModelLoaded(model) end ---Request an animation dictionary diff --git a/modules/target/ox_target/client.lua b/modules/target/ox_target/client.lua index 8fedecd..ad0367a 100644 --- a/modules/target/ox_target/client.lua +++ b/modules/target/ox_target/client.lua @@ -22,14 +22,18 @@ Target = Target or {} Target.FixOptions = function(options) for k, v in pairs(options) do local action = v.onSelect or v.action - local select = function(entityOrData) - if type(entityOrData) == 'table' then - return action(entityOrData.entity) + if not action then + print(("Target option (%s) %s is missing an 'onSelect' or 'action' function."):format(k, v.label)) + else + local select = function(entityOrData) + if type(entityOrData) == 'table' then + return action(entityOrData.entity) + end + return action(entityOrData) end - return action(entityOrData) + options[k].onSelect = select + options[k].groups = v.job or v.groups end - options[k].onSelect = select - options[k].groups = v.job or v.groups end return options end diff --git a/modules/target/sleepless_interact/client.lua b/modules/target/sleepless_interact/client.lua index de80861..b7c6882 100644 --- a/modules/target/sleepless_interact/client.lua +++ b/modules/target/sleepless_interact/client.lua @@ -28,6 +28,7 @@ Target.FixOptions = function(options) return action(entityOrData) end options[k].onSelect = select + options[k].groups = v.job or v.groups end return options end