From b52296026d9e992e4c36648bd849ade0c773319e Mon Sep 17 00:00:00 2001 From: Mycroft Date: Fri, 9 Sep 2022 21:42:06 +0100 Subject: [PATCH] feat(es_extended): Add Support for Account Rounding to OX override --- .../server/classes/overrides/oxinventory.lua | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/[esx]/es_extended/server/classes/overrides/oxinventory.lua b/[esx]/es_extended/server/classes/overrides/oxinventory.lua index b1178e30..ae8a5029 100644 --- a/[esx]/es_extended/server/classes/overrides/oxinventory.lua +++ b/[esx]/es_extended/server/classes/overrides/oxinventory.lua @@ -48,8 +48,8 @@ Core.PlayerFunctionOverrides.OxInventory = { local account = self.getAccount(accountName) if account then - local newMoney = ESX.Math.Round(money) - account.money = newMoney + money = account.round and ESX.Math.Round(money) or money + self.accounts[account.index].money = money self.triggerEvent('esx:setAccountMoney', account) @@ -67,10 +67,9 @@ Core.PlayerFunctionOverrides.OxInventory = { local account = self.getAccount(accountName) if account then - local newMoney = account.money + ESX.Math.Round(money) - account.money = newMoney - - self.triggerEvent('esx:setAccountMoney', account) + money = account.round and ESX.Math.Round(money) or money + self.accounts[account.index].money += money + self.triggerEvent('esx:setAccountMoney', account) if Inventory.accounts[accountName] then Inventory.AddItem(self.source, accountName, money) @@ -86,9 +85,8 @@ Core.PlayerFunctionOverrides.OxInventory = { local account = self.getAccount(accountName) if account then - local newMoney = account.money - ESX.Math.Round(money) - account.money = newMoney - + money = account.round and ESX.Math.Round(money) or money + self.accounts[account.index].money -= money self.triggerEvent('esx:setAccountMoney', account) if Inventory.accounts[accountName] then