From 3a1e121f7965c7a8780f3aee35b7aa79ff0ce484 Mon Sep 17 00:00:00 2001 From: Omar Date: Sat, 13 Sep 2025 13:09:44 +0300 Subject: [PATCH 1/2] Update admin_main.lua --- [admin]/admin/client/gui/admin_main.lua | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/[admin]/admin/client/gui/admin_main.lua b/[admin]/admin/client/gui/admin_main.lua index 5e435fa54..008d9c527 100644 --- a/[admin]/admin/client/gui/admin_main.lua +++ b/[admin]/admin/client/gui/admin_main.lua @@ -144,6 +144,12 @@ y=y+B aTab1.VehicleHealth = guiCreateLabel ( 0.26, y, 0.25, 0.04, "Vehicle Heal if weaponID then aCurrentWeapon = weaponID guiSetText(aTab1.GiveWeapon, "Give: " .. (shortNames[selectedText] or selectedText)) + else + local weaponID = getWeaponIDFromName(selectedText) + if weaponID then + aCurrentWeapon = weaponID + guiSetText(aTab1.GiveWeapon, "Give: " .. (shortNames[selectedText] or selectedText)) + end end end) @@ -177,6 +183,12 @@ y=y+B aTab1.VehicleHealth = guiCreateLabel ( 0.26, y, 0.25, 0.04, "Vehicle Heal if modelID then aCurrentVehicle = modelID guiSetText ( aTab1.GiveVehicle, "Give: "..selectedText ) + else + local modelID = getVehicleModelFromName(selectedText) + if modelID then + aCurrentVehicle = modelID + guiSetText ( aTab1.GiveVehicle, "Give: "..selectedText ) + end end end) From 7161ddebed9a725f205621a393193985adf23191 Mon Sep 17 00:00:00 2001 From: Omar Date: Sat, 13 Sep 2025 13:48:31 +0300 Subject: [PATCH 2/2] Fix lint warning --- [admin]/admin/client/gui/admin_main.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/[admin]/admin/client/gui/admin_main.lua b/[admin]/admin/client/gui/admin_main.lua index 008d9c527..74c4e3339 100644 --- a/[admin]/admin/client/gui/admin_main.lua +++ b/[admin]/admin/client/gui/admin_main.lua @@ -145,9 +145,9 @@ y=y+B aTab1.VehicleHealth = guiCreateLabel ( 0.26, y, 0.25, 0.04, "Vehicle Heal aCurrentWeapon = weaponID guiSetText(aTab1.GiveWeapon, "Give: " .. (shortNames[selectedText] or selectedText)) else - local weaponID = getWeaponIDFromName(selectedText) - if weaponID then - aCurrentWeapon = weaponID + local fallbackWeaponID = getWeaponIDFromName(selectedText) + if fallbackWeaponID then + aCurrentWeapon = fallbackWeaponID guiSetText(aTab1.GiveWeapon, "Give: " .. (shortNames[selectedText] or selectedText)) end end @@ -184,9 +184,9 @@ y=y+B aTab1.VehicleHealth = guiCreateLabel ( 0.26, y, 0.25, 0.04, "Vehicle Heal aCurrentVehicle = modelID guiSetText ( aTab1.GiveVehicle, "Give: "..selectedText ) else - local modelID = getVehicleModelFromName(selectedText) - if modelID then - aCurrentVehicle = modelID + local fallbackModelID = getVehicleModelFromName(selectedText) + if fallbackModelID then + aCurrentVehicle = fallbackModelID guiSetText ( aTab1.GiveVehicle, "Give: "..selectedText ) end end