Merge pull request #6 from AdrineX/master

fix, fully working now.
This commit is contained in:
AdrineX
2017-09-09 16:14:11 +03:00
committed by GitHub
+11 -13
View File
@@ -16,8 +16,8 @@ AddEventHandler('esx_holdup:toofar', function(robb)
for i=1, #xPlayers, 1 do
local xPlayer = ESX.GetPlayerFromId(xPlayers[i])
if xPlayer.job.name == 'police' then
TriggerClientEvent('esx:showNotification', k, _U('robbery_cancelled_at') .. Stores[robb].nameofstore)
TriggerClientEvent('esx_holdup:killblip', k)
TriggerClientEvent('esx:showNotification', xPlayers[i], _U('robbery_cancelled_at') .. Stores[robb].nameofstore)
TriggerClientEvent('esx_holdup:killblip', xPlayers[i])
end
end
if(robbers[source])then
@@ -40,7 +40,6 @@ AddEventHandler('esx_holdup:rob', function(robb)
if (os.time() - store.lastrobbed) < 600 and store.lastrobbed ~= 0 then
TriggerClientEvent('esx:showNotification', source, _U('already_robbed') .. (1800 - (os.time() - store.lastrobbed)) .. _U('seconds'))
return
end
@@ -61,10 +60,10 @@ AddEventHandler('esx_holdup:rob', function(robb)
rob = true
for i=1, #xPlayers, 1 do
local xPlayer = ESX.GetPlayerFromId(xPlayers[i])
if xPlayer.job.name == 'police' then
TriggerClientEvent('esx:showNotification', k, _U('rob_in_prog') .. store.nameofstore)
TriggerClientEvent('esx_holdup:setblip', k, Stores[robb].position)
local xPlayer = ESX.GetPlayerFromId(xPlayers[i])
if xPlayer.job.name == 'police' then
TriggerClientEvent('esx:showNotification', xPlayers[i], _U('rob_in_prog') .. store.nameofstore)
TriggerClientEvent('esx_holdup:setblip', xPlayers[i], Stores[robb].position)
end
end
@@ -84,15 +83,14 @@ AddEventHandler('esx_holdup:rob', function(robb)
if(xPlayer)then
xPlayer.addAccountMoney('black_money', store.reward)
TriggerClientEvent('esx:showNotification', source, _U('robbery_complete'))
local xPlayers = ESX.GetPlayers()
for i=1, #xPlayers, 1 do
local xPlayer = ESX.GetPlayerFromId(xPlayers[i])
if xPlayer.job.name == 'police' then
TriggerClientEvent('esx:showNotification', k, _U('robbery_complete_at') .. store.nameofstore)
TriggerClientEvent('esx_holdup:killblip', k)
local xPlayer = ESX.GetPlayerFromId(xPlayers[i])
if xPlayer.job.name == 'police' then
TriggerClientEvent('esx:showNotification', xPlayers[i], _U('robbery_complete_at') .. store.nameofstore)
TriggerClientEvent('esx_holdup:killblip', xPlayers[i])
end
end
end
end
end)