From d4f1cbb366306dd568bd8138b2a5feb4b85ca5d3 Mon Sep 17 00:00:00 2001 From: 3869542 <76394290+3869542@users.noreply.github.com> Date: Sun, 5 Mar 2023 01:06:12 +0800 Subject: [PATCH 1/3] Update player.lua Fix some cheats use xPlayer.removeInventoryItem(itemName, negative number) to get Item --- [core]/es_extended/server/classes/player.lua | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua index d02757e0..dba0fe5b 100644 --- a/[core]/es_extended/server/classes/player.lua +++ b/[core]/es_extended/server/classes/player.lua @@ -293,14 +293,18 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, if item then count = ESX.Math.Round(count) - local newCount = item.count - count + if count > 0 then + local newCount = item.count - count - if newCount >= 0 then - item.count = newCount - self.weight = self.weight - (item.weight * count) + if newCount >= 0 then + item.count = newCount + self.weight = self.weight - (item.weight * count) - TriggerEvent('esx:onRemoveInventoryItem', self.source, item.name, item.count) - self.triggerEvent('esx:removeInventoryItem', item.name, item.count) + TriggerEvent('esx:onRemoveInventoryItem', self.source, item.name, item.count) + self.triggerEvent('esx:removeInventoryItem', item.name, item.count) + end + else + print(('[^1ERROR^7] Player ID:^5%s Tried remove a Invalid count of name'):format(self.playerId, money)) end end end From 0eeabdb6e034402ed91f920297ce59d75f9eec95 Mon Sep 17 00:00:00 2001 From: 3869542 <76394290+3869542@users.noreply.github.com> Date: Sun, 5 Mar 2023 01:23:28 +0800 Subject: [PATCH 2/3] Update player.lua --- [core]/es_extended/server/classes/player.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua index dba0fe5b..af50abb8 100644 --- a/[core]/es_extended/server/classes/player.lua +++ b/[core]/es_extended/server/classes/player.lua @@ -304,7 +304,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, self.triggerEvent('esx:removeInventoryItem', item.name, item.count) end else - print(('[^1ERROR^7] Player ID:^5%s Tried remove a Invalid count of name'):format(self.playerId, money)) + print(('[^1ERROR^7] Player ID:^5%s Tried remove a Invalid count of name'):format(self.playerId, count)) end end end From afdc384f64d74c03fe6d4ab4983f61c99e60faf2 Mon Sep 17 00:00:00 2001 From: 3869542 <76394290+3869542@users.noreply.github.com> Date: Sun, 5 Mar 2023 01:26:53 +0800 Subject: [PATCH 3/3] Update player.lua --- [core]/es_extended/server/classes/player.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua index af50abb8..7404d944 100644 --- a/[core]/es_extended/server/classes/player.lua +++ b/[core]/es_extended/server/classes/player.lua @@ -304,7 +304,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, self.triggerEvent('esx:removeInventoryItem', item.name, item.count) end else - print(('[^1ERROR^7] Player ID:^5%s Tried remove a Invalid count of name'):format(self.playerId, count)) + print(('[^1ERROR^7] Player ID:^5%s Tried remove a Invalid count -> %s of %s'):format(self.playerId, count,name)) end end end