From 052cecc02568d0b6916e8bba651c03bac3d344fd Mon Sep 17 00:00:00 2001 From: Anton Stjernquist <32514829+antonstjernquist@users.noreply.github.com> Date: Sun, 2 Oct 2022 23:49:35 +0200 Subject: [PATCH 1/4] Update addonaccount.lua Trigger this serverside as well to help with syncing --- [esx_addons]/esx_addonaccount/server/classes/addonaccount.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/[esx_addons]/esx_addonaccount/server/classes/addonaccount.lua b/[esx_addons]/esx_addonaccount/server/classes/addonaccount.lua index a3ae99aa..bda543e5 100644 --- a/[esx_addons]/esx_addonaccount/server/classes/addonaccount.lua +++ b/[esx_addons]/esx_addonaccount/server/classes/addonaccount.lua @@ -26,8 +26,9 @@ function CreateAddonAccount(name, owner, money) else MySQL.update('UPDATE addon_account_data SET money = ? WHERE account_name = ? AND owner = ?', {self.money, self.name, self.owner}) end + TriggerEvent('esx_addonaccount:setMoney', -1, self.name, self.money) TriggerClientEvent('esx_addonaccount:setMoney', -1, self.name, self.money) end return self -end \ No newline at end of file +end From f860aec9b465427ce03bcf9ba76985a65ed42837 Mon Sep 17 00:00:00 2001 From: Anton Stjernquist <32514829+antonstjernquist@users.noreply.github.com> Date: Sun, 2 Oct 2022 23:50:27 +0200 Subject: [PATCH 2/4] Update addonaccount.lua --- [esx_addons]/esx_addonaccount/server/classes/addonaccount.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[esx_addons]/esx_addonaccount/server/classes/addonaccount.lua b/[esx_addons]/esx_addonaccount/server/classes/addonaccount.lua index bda543e5..a823da23 100644 --- a/[esx_addons]/esx_addonaccount/server/classes/addonaccount.lua +++ b/[esx_addons]/esx_addonaccount/server/classes/addonaccount.lua @@ -26,7 +26,7 @@ function CreateAddonAccount(name, owner, money) else MySQL.update('UPDATE addon_account_data SET money = ? WHERE account_name = ? AND owner = ?', {self.money, self.name, self.owner}) end - TriggerEvent('esx_addonaccount:setMoney', -1, self.name, self.money) + TriggerEvent('esx_addonaccount:setMoney', self.name, self.money) TriggerClientEvent('esx_addonaccount:setMoney', -1, self.name, self.money) end From 6e9a8e57c674052870c1dbe2c8ae09c526ba1678 Mon Sep 17 00:00:00 2001 From: Anton Stjernquist <32514829+antonstjernquist@users.noreply.github.com> Date: Mon, 3 Oct 2022 00:15:40 +0200 Subject: [PATCH 3/4] feat: events for updating addon accounts balance --- .../server/classes/addonaccount.lua | 55 ++++++++++--------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/[esx_addons]/esx_addonaccount/server/classes/addonaccount.lua b/[esx_addons]/esx_addonaccount/server/classes/addonaccount.lua index a823da23..fc073576 100644 --- a/[esx_addons]/esx_addonaccount/server/classes/addonaccount.lua +++ b/[esx_addons]/esx_addonaccount/server/classes/addonaccount.lua @@ -1,34 +1,37 @@ function CreateAddonAccount(name, owner, money) - local self = {} + local self = {} - self.name = name - self.owner = owner - self.money = money + self.name = name + self.owner = owner + self.money = money - function self.addMoney(m) - self.money = self.money + m - self.save() - end + function self.addMoney(m) + self.money = self.money + m + self.save() + TriggerEvent('esx_addonaccount:addMoney', self.name, m) + end - function self.removeMoney(m) - self.money = self.money - m - self.save() - end + function self.removeMoney(m) + self.money = self.money - m + self.save() + TriggerEvent('esx_addonaccount:removeMoney', self.name, m) + end - function self.setMoney(m) - self.money = m - self.save() - end + function self.setMoney(m) + self.money = m + self.save() + TriggerEvent('esx_addonaccount:setMoney', self.name, m) + end - function self.save() - if self.owner == nil then - MySQL.update('UPDATE addon_account_data SET money = ? WHERE account_name = ?', {self.money, self.name}) - else - MySQL.update('UPDATE addon_account_data SET money = ? WHERE account_name = ? AND owner = ?', {self.money, self.name, self.owner}) - end - TriggerEvent('esx_addonaccount:setMoney', self.name, self.money) - TriggerClientEvent('esx_addonaccount:setMoney', -1, self.name, self.money) - end + function self.save() + if self.owner == nil then + MySQL.update('UPDATE addon_account_data SET money = ? WHERE account_name = ?', {self.money, self.name}) + else + MySQL.update('UPDATE addon_account_data SET money = ? WHERE account_name = ? AND owner = ?', + {self.money, self.name, self.owner}) + end + TriggerClientEvent('esx_addonaccount:setMoney', -1, self.name, self.money) + end - return self + return self end From c55a5bb6c9eaa70bf62c8b470fdada988f4ae381 Mon Sep 17 00:00:00 2001 From: Anton Stjernquist <32514829+antonstjernquist@users.noreply.github.com> Date: Mon, 3 Oct 2022 00:16:02 +0200 Subject: [PATCH 4/4] Update addonaccount.lua --- .../server/classes/addonaccount.lua | 57 +++++++++---------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/[esx_addons]/esx_addonaccount/server/classes/addonaccount.lua b/[esx_addons]/esx_addonaccount/server/classes/addonaccount.lua index fc073576..2364409d 100644 --- a/[esx_addons]/esx_addonaccount/server/classes/addonaccount.lua +++ b/[esx_addons]/esx_addonaccount/server/classes/addonaccount.lua @@ -1,37 +1,36 @@ function CreateAddonAccount(name, owner, money) - local self = {} + local self = {} - self.name = name - self.owner = owner - self.money = money + self.name = name + self.owner = owner + self.money = money - function self.addMoney(m) - self.money = self.money + m - self.save() - TriggerEvent('esx_addonaccount:addMoney', self.name, m) - end + function self.addMoney(m) + self.money = self.money + m + self.save() + TriggerEvent('esx_addonaccount:addMoney', self.name, m) + end - function self.removeMoney(m) - self.money = self.money - m - self.save() - TriggerEvent('esx_addonaccount:removeMoney', self.name, m) - end + function self.removeMoney(m) + self.money = self.money - m + self.save() + TriggerEvent('esx_addonaccount:removeMoney', self.name, m) + end - function self.setMoney(m) - self.money = m - self.save() - TriggerEvent('esx_addonaccount:setMoney', self.name, m) - end + function self.setMoney(m) + self.money = m + self.save() + TriggerEvent('esx_addonaccount:setMoney', self.name, m) + end - function self.save() - if self.owner == nil then - MySQL.update('UPDATE addon_account_data SET money = ? WHERE account_name = ?', {self.money, self.name}) - else - MySQL.update('UPDATE addon_account_data SET money = ? WHERE account_name = ? AND owner = ?', - {self.money, self.name, self.owner}) - end - TriggerClientEvent('esx_addonaccount:setMoney', -1, self.name, self.money) - end + function self.save() + if self.owner == nil then + MySQL.update('UPDATE addon_account_data SET money = ? WHERE account_name = ?', {self.money, self.name}) + else + MySQL.update('UPDATE addon_account_data SET money = ? WHERE account_name = ? AND owner = ?', {self.money, self.name, self.owner}) + end + TriggerClientEvent('esx_addonaccount:setMoney', -1, self.name, self.money) + end - return self + return self end