Merge pull request #959 from bitpredator/dev

Dev
bitpredator · Jan 18, 2025 · 91c2a00 · 91c2a00
2 parents cf03a4b + a46186e
commit 91c2a00
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/server-data/resources/[esx]/pushvehicle/client/main.lua b/server-data/resources/[esx]/pushvehicle/client/main.lua
@@ -1,3 +1,4 @@
+---@diagnostic disable: undefined-global
 local AttachEntityToEntity = AttachEntityToEntity
 local GetEntityCoords = GetEntityCoords
 local GetEntityModel = GetEntityModel
@@ -345,9 +346,9 @@ if Config.target then
             for i = 1, #options do
                 options[i].bones = { "bonnet", "boot" }
             end
-            exports[targetSystem]:addGlobalVehicle(options)
+            exports.ox_target:addGlobalVehicle(options)
         else
-            exports[targetSystem]:addGlobalVehicle(options)
+            exports.ox_target:addGlobalVehicle(options)
         end
     elseif targetSystem == "qb-target" then
         if Config.Usebones then

diff --git a/server-data/resources/[esx]/pushvehicle/server/main.lua b/server-data/resources/[esx]/pushvehicle/server/main.lua
@@ -1,3 +1,4 @@
+---@diagnostic disable: undefined-global
 local pushing = {}
 local beingpushed = {}
 local skilltrack = {}

diff --git a/server-data/resources/[esx_addons]/ps-dispatch/server/sv_main.lua b/server-data/resources/[esx_addons]/ps-dispatch/server/sv_main.lua
@@ -6,7 +6,7 @@ function _U(entry)
 end
 
 local function IsPoliceJob(job)
-    for k, v in pairs(Config.PoliceJob) do
+    for _, v in pairs(Config.PoliceJob) do
         if job == v then
             return true
         end
@@ -15,7 +15,7 @@ local function IsPoliceJob(job)
 end
 
 local function IsDispatchJob(job)
-    for k, v in pairs(Config.PoliceAndAmbulance) do
+    for _, v in pairs(Config.PoliceAndAmbulance) do
         if job == v then
             return true
         end

diff --git a/server-data/resources/[ox]/ox_inventory/data/shops.lua b/server-data/resources/[ox]/ox_inventory/data/shops.lua
@@ -100,7 +100,6 @@ return {
             { name = "burger", price = 70 },
             { name = "fishingrod", price = 100 },
             { name = "fishbait", price = 80 },
-            { name = "panettone", price = 40 },
         },
         locations = {
             vec3(25.846155, -1346.782471, 29.482056),