starred/esx_core
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-30 17:58:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed RemoveWeaponsAfterRPDeath, fixes #21

Browse Source
This commit is contained in:
ElPumpo
2018-06-20 21:24:00 +02:00
parent e034a63758
commit fdcc9ab9e5
3 changed files with 43 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
__resource.lua
+2
View File
@@ -28,3 +28,5 @@ client_scripts {
'config.lua',
'client/main.lua'
}
dependency 'es_extended'
client/main.lua
+1 -1
View File
@@ -647,7 +647,7 @@ AddEventHandler('esx_phone:loaded', function(phoneNumber, contacts)
end)
AddEventHandler('esx:onPlayerDeath', function()
AddEventHandler('esx:onPlayerDeath', function(reason)
OnPlayerDeath()
end)
server/main.lua
+40 -29
View File
@@ -21,42 +21,53 @@ TriggerEvent('esx_phone:registerNumber', 'ambulance', _U('alert_ambulance'), tru
TriggerEvent('esx_society:registerSociety', 'ambulance', 'Ambulance', 'society_ambulance', 'society_ambulance', 'society_ambulance', {type = 'public'})
ESX.RegisterServerCallback('esx_ambulancejob:removeItemsAfterRPDeath', function(source, cb)
local xPlayer = ESX.GetPlayerFromId(source)
local xPlayer = ESX.GetPlayerFromId(source)
if Config.RemoveCashAfterRPDeath then
if xPlayer.getMoney() > 0 then
xPlayer.removeMoney(xPlayer.getMoney())
end
if Config.RemoveCashAfterRPDeath then
if xPlayer.getAccount('black_money').money > 0 then
xPlayer.setAccountMoney('black_money', 0)
end
end
if xPlayer.getMoney() > 0 then
xPlayer.removeMoney(xPlayer.getMoney())
end
if Config.RemoveItemsAfterRPDeath then
for i=1, #xPlayer.inventory, 1 do
if xPlayer.inventory[i].count > 0 then
xPlayer.setInventoryItem(xPlayer.inventory[i].name, 0)
end
end
end
if xPlayer.getAccount('black_money').money > 0 then
xPlayer.setAccountMoney('black_money', 0)
end
local playerLoadout = {}
if Config.RemoveWeaponsAfterRPDeath then
for i=1, #xPlayer.loadout, 1 do
xPlayer.removeWeapon(xPlayer.loadout[i].name)
end
else -- save weapons & restore em' since
for i=1, #xPlayer.loadout, 1 do
table.insert(playerLoadout, xPlayer.loadout[i])
end
end
-- give back wepaons after a couple of seconds
Citizen.CreateThread(function()
Citizen.Wait(5000)
for i=1, #playerLoadout, 1 do
if playerLoadout[i].label ~= nil then
xPlayer.addWeapon(playerLoadout[i].name, playerLoadout[i].ammo)
end
end
end)
end
if Config.RemoveItemsAfterRPDeath then
for i=1, #xPlayer.inventory, 1 do
if xPlayer.inventory[i].count > 0 then
xPlayer.setInventoryItem(xPlayer.inventory[i].name, 0)
end
end
end
if Config.RemoveWeaponsAfterRPDeath then
for i=1, #xPlayer.loadout, 1 do
xPlayer.removeWeapon(xPlayer.loadout[i].name)
end
end
if Config.RespawnFine then
TriggerClientEvent('esx:showNotification', xPlayer.source, _U('respawn_fine', Config.RespawnFineAmount))
xPlayer.removeAccountMoney('bank', Config.RespawnFineAmount)
end
cb()
if Config.RespawnFine then
TriggerClientEvent('esx:showNotification', xPlayer.source, _U('respawn_fine', Config.RespawnFineAmount))
xPlayer.removeAccountMoney('bank', Config.RespawnFineAmount)
end
cb()
end)
ESX.RegisterServerCallback('esx_ambulancejob:getItemAmount', function(source, cb, item)