diff --git a/resources/[essential]/es_extended/__resource.lua b/resources/[essential]/es_extended/__resource.lua index 225d2734..9557254a 100644 --- a/resources/[essential]/es_extended/__resource.lua +++ b/resources/[essential]/es_extended/__resource.lua @@ -15,6 +15,7 @@ server_scripts { 'server/common.lua', 'server/classes/player.lua', 'server/functions.lua', + 'server/paycheck.lua', 'server/main.lua', 'server/commands.lua' } diff --git a/resources/[essential]/es_extended/server/functions.lua b/resources/[essential]/es_extended/server/functions.lua index fad63172..ffbbe1dd 100644 --- a/resources/[essential]/es_extended/server/functions.lua +++ b/resources/[essential]/es_extended/server/functions.lua @@ -177,31 +177,6 @@ ESX.StartDBSync = function() end -ESX.StartPayCheck = function() - - function payCheck() - - local xPlayers = ESX.GetPlayers() - - for i=1, #xPlayers, 1 do - - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - - if xPlayer.job.grade_salary > 0 then - xPlayer.addMoney(xPlayer.job.grade_salary) - TriggerClientEvent('esx:showNotification', xPlayer.source, _U('rec_salary') .. '~g~$' .. xPlayer.job.grade_salary) - end - - end - - SetTimeout(Config.PaycheckInterval, payCheck) - - end - - SetTimeout(Config.PaycheckInterval, payCheck) - -end - ESX.GetPlayers = function() local sources = {} diff --git a/resources/[essential]/es_extended/server/main.lua b/resources/[essential]/es_extended/server/main.lua index e634c744..7985851a 100644 --- a/resources/[essential]/es_extended/server/main.lua +++ b/resources/[essential]/es_extended/server/main.lua @@ -305,7 +305,7 @@ AddEventHandler('esx:giveInventoryItem', function(target, type, itemName, itemCo if itemCount > 0 and sourceItem.count >= itemCount then - if targetItem.limit ~= -1 and (targetItem.count + sourceItem.count) > targetItem.limit then + if targetItem.limit ~= -1 and (targetItem.count + itemCount) > targetItem.limit then TriggerClientEvent('esx:showNotification', target, _U('ex_inv_lim') .. targetXPlayer.name) else sourceXPlayer.removeInventoryItem(itemName, itemCount) diff --git a/resources/[essential]/es_extended/server/paycheck.lua b/resources/[essential]/es_extended/server/paycheck.lua new file mode 100644 index 00000000..f68818a4 --- /dev/null +++ b/resources/[essential]/es_extended/server/paycheck.lua @@ -0,0 +1,24 @@ +ESX.StartPayCheck = function() + + function payCheck() + + local xPlayers = ESX.GetPlayers() + + for i=1, #xPlayers, 1 do + + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + + if xPlayer.job.grade_salary > 0 then + xPlayer.addMoney(xPlayer.job.grade_salary) + TriggerClientEvent('esx:showNotification', xPlayer.source, _U('rec_salary') .. '~g~$' .. xPlayer.job.grade_salary) + end + + end + + SetTimeout(Config.PaycheckInterval, payCheck) + + end + + SetTimeout(Config.PaycheckInterval, payCheck) + +end \ No newline at end of file