starred/esx_core-esx-framework
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-09-04 16:23:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

improvement(holdup): Use the new arguments for GetExtendedPlayers()

Browse Source
This commit is contained in:
Linden
2021-06-30 21:51:25 +10:00
parent c1d9fbed05
commit c8d23d4673
1 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
[esx_addons]/esx_holdup/server/main.lua
+10 -25
View File
@@ -4,14 +4,10 @@ local robbers = {}
RegisterServerEvent('esx_holdup:tooFar')
AddEventHandler('esx_holdup:tooFar', function(currentStore)
local _source = source
local xPlayers = ESX.GetExtendedPlayers()
rob = false
for _, xPlayer in pairs(xPlayers) do
if xPlayer.job.name == 'police' then
TriggerClientEvent('esx:showNotification', xPlayer.source, _U('robbery_cancelled_at', Stores[currentStore].nameOfStore))
TriggerClientEvent('esx_holdup:killBlip', xPlayer.source)
end
for _, xPlayer in pairs(ESX.GetExtendedPlayers('job', 'police')) do
TriggerClientEvent('esx:showNotification', xPlayer.source, _U('robbery_cancelled_at', Stores[currentStore].nameOfStore))
TriggerClientEvent('esx_holdup:killBlip', xPlayer.source)
end
if robbers[_source] then
@@ -25,7 +21,6 @@ RegisterServerEvent('esx_holdup:robberyStarted')
AddEventHandler('esx_holdup:robberyStarted', function(currentStore)
local _source = source
local xPlayer = ESX.GetPlayerFromId(_source)
local xPlayers = ESX.GetExtendedPlayers()
if Stores[currentStore] then
local store = Stores[currentStore]
@@ -35,22 +30,14 @@ AddEventHandler('esx_holdup:robberyStarted', function(currentStore)
return
end
local cops = 0
for _, xPlayer in pairs(xPlayers) do
if xPlayer.job.name == 'police' then
cops = cops + 1
end
end
if not rob then
if cops >= Config.PoliceNumberRequired then
local xPlayers = ESX.GetExtendedPlayers('job', 'police')
if #xPlayers >= Config.PoliceNumberRequired then
rob = true
for _, xPlayer in pairs(xPlayers) do
if xPlayer.job.name == 'police' then
TriggerClientEvent('esx:showNotification', xPlayer.source, _U('rob_in_prog', store.nameOfStore))
TriggerClientEvent('esx_holdup:setBlip', xPlayer.source, Stores[currentStore].position)
end
TriggerClientEvent('esx:showNotification', xPlayer.source, _U('rob_in_prog', store.nameOfStore))
TriggerClientEvent('esx_holdup:setBlip', xPlayer.source, Stores[currentStore].position)
end
TriggerClientEvent('esx:showNotification', _source, _U('started_to_rob', store.nameOfStore))
@@ -74,12 +61,10 @@ AddEventHandler('esx_holdup:robberyStarted', function(currentStore)
xPlayer.addMoney(store.reward)
end
local xPlayers = ESX.GetExtendedPlayers()
local xPlayers = ESX.GetExtendedPlayers('job', 'police')
for _, xPlayer in pairs(xPlayers) do
if xPlayer.job.name == 'police' then
TriggerClientEvent('esx:showNotification', xPlayer.source, _U('robbery_complete_at', store.nameOfStore))
TriggerClientEvent('esx_holdup:killBlip', xPlayer.source)
end
TriggerClientEvent('esx:showNotification', xPlayer.source, _U('robbery_complete_at', store.nameOfStore))
TriggerClientEvent('esx_holdup:killBlip', xPlayer.source)
end
end
end