Skip to content
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

Jump to bottom

Security Enhancement: Distance Check for 'esx:onPickup' Event #1161

Merged
merged 4 commits into from
Aug 25, 2023
Merged

Security Enhancement: Distance Check for 'esx:onPickup' Event #1161

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7253c54
Use vector for coords
Kenshiin13 Aug 20, 2023
aa1ea63
Add distance check for net-safe event "esx:onPickup"
Kenshiin13 Aug 20, 2023
92d6f49
Added ability to spawn pickup at any given coordinate
Kenshiin13 Aug 20, 2023
1b27475
Refactor param name 'type'
Kenshiin13 Aug 23, 2023
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
2 changes: 1 addition & 1 deletion [core]/es_extended/client/main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ if not Config.OxInventory then
obj = object,
label = label,
inRange = false,
coords = vector3(coords.x, coords.y, coords.z)
coords = coords
}
end

Expand Down
2 changes: 1 addition & 1 deletion [core]/es_extended/server/functions.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ if not Config.OxInventory then
function ESX.CreatePickup(type, name, count, label, playerId, components, tintIndex)
local pickupId = (Core.PickupId == 65635 and 0 or Core.PickupId + 1)
local xPlayer = ESX.Players[playerId]
local coords = xPlayer.getCoords()
local coords = xPlayer.getCoords(true)

Core.Pickups[pickupId] = { type = type, name = name, count = count, label = label, coords = coords }

Expand Down
6 changes: 6 additions & 0 deletions [core]/es_extended/server/main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,12 @@ if not Config.OxInventory then
local pickup, xPlayer, success = Core.Pickups[pickupId], ESX.GetPlayerFromId(source)

if pickup then
local playerPickupDistance = #(pickup.coords - xPlayer.getCoords(true))
if(playerPickupDistance > 5.0) then
print(('[^3WARNING^7] Player Detected Cheating (Out of range pickup): ^5%s^7'):format(xPlayer.getIdentifier()))
return
end

if pickup.type == 'item_standard' then
if xPlayer.canCarryItem(pickup.name, pickup.count) then
xPlayer.addInventoryItem(pickup.name, pickup.count)
Expand Down
Loading