From 06dcf1e33808b023de8054c778d3d26965db5709 Mon Sep 17 00:00:00 2001 From: Nordi98 Date: Sat, 2 Aug 2025 14:43:29 +0200 Subject: [PATCH] Update client.lua --- .../[inventory]/nordi_petbowl/client.lua | 35 +++++++++++++------ 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/resources/[inventory]/nordi_petbowl/client.lua b/resources/[inventory]/nordi_petbowl/client.lua index 76ed863dc..556533a04 100644 --- a/resources/[inventory]/nordi_petbowl/client.lua +++ b/resources/[inventory]/nordi_petbowl/client.lua @@ -165,13 +165,33 @@ end) -- Register a new bowl (for props placed with ProPlacer) RegisterNetEvent('pet-bowls:client:registerNewBowl', function(modelName, bowlType) + -- Check if we received parameters directly or as part of a data table + local model, type + + -- Handle both direct parameters and data table format + if type(modelName) == "table" and modelName.modelName then + -- We received a data table from qb-target + model = modelName.modelName + type = modelName.bowlType + else + -- We received direct parameters + model = modelName + type = bowlType + end + + -- Ensure we have valid parameters + if not model or not type then + print("^1[Pet-Bowls]^7 Missing model or type for bowl registration") + return + end + -- Find the closest valid prop local playerPed = PlayerPedId() local playerCoords = GetEntityCoords(playerPed) local closestObject = nil local closestDistance = 3.0 -- Maximum distance to consider - local validModel = GetHashKey(modelName) + local validModel = GetHashKey(model) local objects = GetGamePool('CObject') for _, object in pairs(objects) do @@ -194,7 +214,7 @@ RegisterNetEvent('pet-bowls:client:registerNewBowl', function(modelName, bowlTyp local coords = GetEntityCoords(closestObject) local heading = GetEntityHeading(closestObject) - TriggerServerEvent('pet-bowls:server:placeBowl', bowlId, modelName, bowlType, { + TriggerServerEvent('pet-bowls:server:placeBowl', bowlId, model, type, { x = coords.x, y = coords.y, z = coords.z, @@ -205,13 +225,13 @@ RegisterNetEvent('pet-bowls:client:registerNewBowl', function(modelName, bowlTyp placedBowls[bowlId] = { object = closestObject, id = bowlId, - model = modelName, - type = bowlType, + model = model, + type = type, fillLevel = 0 } -- Add target - AddTargetToBowl(closestObject, bowlId, bowlType) + AddTargetToBowl(closestObject, bowlId, type) lib.notify(Config.Notifications.bowlPlaced) else @@ -310,8 +330,3 @@ Citizen.CreateThread(function() print("^2[Pet-Bowls]^7 Added registration targets to " .. addedTargets .. " unregistered bowl props") end) - --- Event handler for registering from target -RegisterNetEvent('pet-bowls:client:registerNewBowl', function(data) - TriggerEvent('pet-bowls:client:registerNewBowl', data.modelName, data.bowlType) -end)