Skip to content

refactor: improve money handling logic to prevent potential exploit #1753

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AlexRXWindy wants to merge 1 commit into
base: dev
Choose a base branch
from
+30 −12
Open

refactor: improve money handling logic to prevent potential exploit #1753

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 30 additions & 12 deletions [core]/es_extended/server/classes/overrides/oxinventory.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,36 +64,54 @@ Core.PlayerFunctionOverrides.OxInventory = {
addAccountMoney = function(self)
return function(accountName, money, reason)
reason = reason or "unknown"
if money < 1 then return end
if money < 1 then return false end

local account = self.getAccount(accountName)
if not account then return end
if not account then return false end

money = account.round and ESX.Math.Round(money) or money
self.accounts[account.index].money = self.accounts[account.index].money + money
self.triggerEvent("esx:setAccountMoney", account)
TriggerEvent("esx:addAccountMoney", self.source, accountName, money, reason)

if Inventory.accounts[accountName] then
Inventory.AddItem(self.source, accountName, money)
local added = Inventory.AddItem(self.source, accountName, money)
if not added then
return false
end
self.triggerEvent("esx:setAccountMoney", account)
TriggerEvent("esx:addAccountMoney", self.source, accountName, money, reason)
else
self.accounts[account.index].money = self.accounts[account.index].money + money
self.triggerEvent("esx:setAccountMoney", account)
TriggerEvent("esx:addAccountMoney", self.source, accountName, money, reason)
end

return true
end
end,

removeAccountMoney = function(self)
return function(accountName, money, reason)
reason = reason or "unknown"
if money < 1 then return end
if money < 1 then return false end

local account = self.getAccount(accountName)
if not account then return end
if not account then return false end

money = account.round and ESX.Math.Round(money) or money
self.accounts[account.index].money = self.accounts[account.index].money - money
self.triggerEvent("esx:setAccountMoney", account)
TriggerEvent("esx:removeAccountMoney", self.source, accountName, money, reason)

if Inventory.accounts[accountName] then
Inventory.RemoveItem(self.source, accountName, money)
local removed = Inventory.RemoveItem(self.source, accountName, money)
if not removed then
return false
end
self.triggerEvent("esx:setAccountMoney", account)
TriggerEvent("esx:removeAccountMoney", self.source, accountName, money, reason)
else
self.accounts[account.index].money = self.accounts[account.index].money - money
self.triggerEvent("esx:setAccountMoney", account)
TriggerEvent("esx:removeAccountMoney", self.source, accountName, money, reason)
end

return true
end
end,

Expand Down
Loading