Merge pull request #978 from bitpredator/dev

fix: removed the GiveWeaponToPed
bitpredator · Feb 9, 2025 · 7bde9c3 · 7bde9c3
2 parents 71e9573 + 9afcda9
commit 7bde9c3
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 23 deletions.
diff --git a/server-data/resources/[esx_addons]/xt-robnpcs/bridge/client/esx.lua b/server-data/resources/[esx_addons]/xt-robnpcs/bridge/client/esx.lua
@@ -2,7 +2,7 @@ if GetResourceState('es_extended') ~= 'started' then return end
 
 local ESX = exports["es_extended"]:getSharedObject()
 
-function isBlacklistedJob(jobs)
+function IsBlacklistedJob(jobs)
     local Player = ESX.GetPlayerData()
     if type(jobs) == 'table' then
         for x = 1, #jobs do

diff --git a/server-data/resources/[esx_addons]/xt-robnpcs/bridge/client/ox.lua b/server-data/resources/[esx_addons]/xt-robnpcs/bridge/client/ox.lua
@@ -1,14 +1,17 @@
-if GetResourceState('ox_core') ~= 'started' then return end
+if GetResourceState("ox_core") ~= "started" then
+    return
+end
 
-local file = ('imports/%s.lua'):format(IsDuplicityVersion() and 'server' or 'client')
-local import = LoadResourceFile('ox_core', file)
-local chunk = assert(load(import, ('@@ox_core/%s'):format(file)))
+local file = ("imports/%s.lua"):format(IsDuplicityVersion() and "server" or "client")
+local import = LoadResourceFile("ox_core", file)
+local chunk = assert(load(import, ("@@ox_core/%s"):format(file)))
+local player
 chunk()
 
-function isBlacklistedJob(jobs)
+function IsBlacklistedJob(jobs)
     return player.hasGroup(jobs)
 end
 
-AddEventHandler('ox:playerLogout', function()
-    TriggerEvent('xt-robnpcs:client:onUnload')
-end)
+AddEventHandler("ox:playerLogout", function()
+    TriggerEvent("xt-robnpcs:client:onUnload")
+end)
diff --git a/server-data/resources/[esx_addons]/xt-robnpcs/bridge/client/qb.lua b/server-data/resources/[esx_addons]/xt-robnpcs/bridge/client/qb.lua
@@ -2,7 +2,7 @@ if GetResourceState('qb-core') ~= 'started' then return end
 
 local QBCore = exports['qb-core']:GetCoreObject()
 
-function isBlacklistedJob(jobs)
+function IsBlacklistedJob(jobs)
     local Player = QBCore.Functions.GetPlayerData()
     if type(jobs) == 'table' then
         for x = 1, #jobs do

diff --git a/server-data/resources/[esx_addons]/xt-robnpcs/bridge/server/ox.lua b/server-data/resources/[esx_addons]/xt-robnpcs/bridge/server/ox.lua
@@ -1,8 +1,10 @@
-if GetResourceState('ox_core') ~= 'started' then return end
+if GetResourceState("ox_core") ~= "started" then
+    return
+end
 
-local file = ('imports/%s.lua'):format(IsDuplicityVersion() and 'server' or 'client')
-local import = LoadResourceFile('ox_core', file)
-local chunk = assert(load(import, ('@@ox_core/%s'):format(file)))
+local file = ("imports/%s.lua"):format(IsDuplicityVersion() and "server" or "client")
+local import = LoadResourceFile("ox_core", file)
+local chunk = assert(load(import, ("@@ox_core/%s"):format(file)))
 chunk()
 
 function getPlayer(id)
@@ -12,4 +14,4 @@ end
 function getPlayerJob(src)
     local player = getPlayer(src)
     return player and player.getGroup() or nil
-end
+end
diff --git a/server-data/resources/[esx_addons]/xt-robnpcs/client/cl_main.lua b/server-data/resources/[esx_addons]/xt-robnpcs/client/cl_main.lua
@@ -186,7 +186,7 @@ end
 
 -- Handlers --
 lib.onCache('weapon', function(newWeapon)
-    if not newWeapon or not isAllowedWeapon(newWeapon) or isBlacklistedJob(config.blacklistedJobs) then return end
+    if not newWeapon or not isAllowedWeapon(newWeapon) or IsBlacklistedJob(config.blacklistedJobs) then return end
 
     aimAtPedsLoop(newWeapon)
 end)

diff --git a/server-data/resources/[esx_addons]/xt-robnpcs/client/utils.lua b/server-data/resources/[esx_addons]/xt-robnpcs/client/utils.lua
@@ -53,20 +53,19 @@ function attackingPed(entity)
         ClearPedTasksImmediately(entity)
     end
 
-    SetPedFleeAttributes(entity, 0, 0)
-    SetPedCombatAttributes(entity, 46, 1)       -- BF_CanFightArmedPedsWhenNotArmed
-    SetPedCombatAttributes(entity, 17, 0)       -- BF_AlwaysFlee
-    SetPedCombatAttributes(entity, 5, 1)        -- BF_AlwaysFight
-    SetPedCombatAttributes(entity, 58, 1)       -- BF_DisableFleeFromCombat
+    SetPedFleeAttributes(entity, 0, false)
+    SetPedCombatAttributes(entity, 46, true)       -- BF_CanFightArmedPedsWhenNotArmed
+    SetPedCombatAttributes(entity, 17, false)       -- BF_AlwaysFlee
+    SetPedCombatAttributes(entity, 5, true)        -- BF_AlwaysFight
+    SetPedCombatAttributes(entity, 58, true)       -- BF_DisableFleeFromCombat
     SetPedCombatRange(entity, 3)
     SetPedRelationshipGroupHash(entity, joaat('HATES_PLAYER'))
     TaskCombatHatedTargetsAroundPed(entity, 50, 0)
 
     local weaponChance = math.random(config.chancePedIsArmedWhileFighting.min, config.chancePedIsArmedWhileFighting.max)
     local randomChance2 = math.random(100)
     if randomChance2 <= weaponChance then
-        local randomWeapon = math.random(#config.pedWeapons)
-        GiveWeaponToPed(entity, config.pedWeapons[randomWeapon], false, false)
+        local _ = math.random(#config.pedWeapons)
     end
 
     TaskCombatHatedTargetsAroundPed(entity, 50, 0)