starred/esx_core
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-29 09:18:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(es_extended): New Server Events for account syncing

Browse Source
This commit is contained in:
Mycroft
2022-09-09 22:14:08 +01:00
parent b52296026d
commit 2851032034
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
[esx]/es_extended/server/classes/overrides/oxinventory.lua
+9 -6
View File
@@ -43,7 +43,8 @@ Core.PlayerFunctionOverrides.OxInventory = {
end,
setAccountMoney = function(self)
return function(accountName,money)
return function(accountName,money, reason)
reason = reason or 'unknown'
if money >= 0 then
local account = self.getAccount(accountName)
@@ -52,7 +53,7 @@ Core.PlayerFunctionOverrides.OxInventory = {
self.accounts[account.index].money = money
self.triggerEvent('esx:setAccountMoney', account)
TriggerEvent('esx:setAccountMoney', self.source, accountName, money, reason)
if Inventory.accounts[accountName] then
Inventory.SetItem(self.source, accountName, money)
end
@@ -62,7 +63,8 @@ Core.PlayerFunctionOverrides.OxInventory = {
end,
addAccountMoney = function(self)
return function(accountName,money)
return function(accountName,money, reason)
reason = reason or 'unknown'
if money > 0 then
local account = self.getAccount(accountName)
@@ -70,7 +72,7 @@ Core.PlayerFunctionOverrides.OxInventory = {
money = account.round and ESX.Math.Round(money) or 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)
end
@@ -80,7 +82,8 @@ Core.PlayerFunctionOverrides.OxInventory = {
end,
removeAccountMoney = function(self)
return function(accountName,money)
return function(accountName,money, reason)
reason = reason or 'unknown'
if money > 0 then
local account = self.getAccount(accountName)
@@ -88,7 +91,7 @@ Core.PlayerFunctionOverrides.OxInventory = {
money = account.round and ESX.Math.Round(money) or 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)
end
[esx]/es_extended/server/classes/player.lua
+9 -3
View File
@@ -171,7 +171,8 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
self.name = newName
end
function self.setAccountMoney(accountName, money)
function self.setAccountMoney(accountName, money, reason)
reason = reason or 'unknown'
if not tonumber(money) then
print(('[^1ERROR^7] Tried To Set Account ^5%s^0 For Player ^5%s^0 To An Invalid Number!'):format(accountName, self.playerId))
return
@@ -184,6 +185,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
self.accounts[account.index].money = money
self.triggerEvent('esx:setAccountMoney', account)
TriggerEvent('esx:setAccountMoney', self.source, accountName, money, reason)
else
print(('[^1ERROR^7] Tried To Set Invalid Account ^5%s^0 For Player ^5%s^0!'):format(accountName, self.playerId))
end
@@ -192,7 +194,8 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
end
end
function self.addAccountMoney(accountName, money)
function self.addAccountMoney(accountName, money, reason)
reason = reason or 'Unknown'
if not tonumber(money) then
print(('[^1ERROR^7] Tried To Set Account ^5%s^0 For Player ^5%s^0 To An Invalid Number!'):format(accountName, self.playerId))
return
@@ -204,6 +207,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
self.accounts[account.index].money += money
self.triggerEvent('esx:setAccountMoney', account)
TriggerEvent('esx:addAccountMoney', self.source, accountName, money, reason)
else
print(('[^1ERROR^7] Tried To Set Add To Invalid Account ^5%s^0 For Player ^5%s^0!'):format(accountName, self.playerId))
end
@@ -212,7 +216,8 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
end
end
function self.removeAccountMoney(accountName, money)
function self.removeAccountMoney(accountName, money, reason)
reason = reason or 'Unknown'
if not tonumber(money) then
print(('[^1ERROR^7] Tried To Set Account ^5%s^0 For Player ^5%s^0 To An Invalid Number!'):format(accountName, self.playerId))
return
@@ -225,6 +230,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
self.accounts[account.index].money -= money
self.triggerEvent('esx:setAccountMoney', account)
TriggerEvent('esx:removeAccountMoney', self.source, accountName, money, reason)
else
print(('[^1ERROR^7] Tried To Set Add To Invalid Account ^5%s^0 For Player ^5%s^0!'):format(accountName, self.playerId))
end