Compare commits

...
22 Commits
Author SHA1 Message Date
Jim Shield 40eed38dc2 Strengthen toggleItem security
- locked down `addItem` to be a lot more strict to reduce exploits
- fixed issue for if no supported inventory was found it now uses the correct functions
2026-11-05 18:03:24 +00:00
Jim Shield 8c947aae73 fallback for searchCar if info couldn't be found 2026-11-05 17:39:26 +00:00
Jim Shield a96602d351 add batch of functions to control peds 2026-11-05 17:38:57 +00:00
Jim Shield b176f9d5ad Improve makeProp handling code 2026-11-05 17:37:47 +00:00
Jim Shield 41ac8d8d7f Improve makePed handling code 2026-11-05 17:36:31 +00:00
Jim Shield 08be58d14f improve loadModel() request code 2026-11-05 17:33:48 +00:00
Jim Shield b891701359 minor adjustments for backend code 2026-11-05 17:33:07 +00:00
Jim Shield 71c0abb32c add exploit protection to SellShop
- Added server registered prices to sellShops to stop clients ability to send false amounts (needs a small change to external scripts)
2026-10-19 21:47:17 +01:00
McKlean 949363c76a Merge pull request #70 from ChrisNewmanDev/main
Added Wasabi Banking
2026-03-03 23:36:42 +00:00
Chris Newman d21f4b22b5 Added Wasabi Banking
Added Wasabi Banking to societybank.lua
2026-02-18 14:56:51 +02:00
Jim Shield e84a9f1c60 Version Bump
`2.1.08` - `2.1.09`
2025-11-10 17:07:58 +00:00
Jim Shield 12c6648767 Merge pull request #64 from rukshanchamindu/patch-1 2025-11-10 17:00:52 +00:00
RuksH4n 9a57f852b1 fix: replace boolean logic with math.max for tempCarryTable aggregation
Replaced the old `and/or` logic in the recipe ingredient loop with `math.max`
to ensure tempCarryTable[k] always stores numeric values instead of booleans.
This prevents "attempt to compare boolean with number" errors during crafting
data aggregation.
2025-11-07 21:59:18 +05:30
Jim Shield 61aae4fa92 Change esx get status to statebag check 2025-11-03 22:37:55 +00:00
Jim Shield 606ad1d124 Update notify.lua 2025-11-02 22:43:02 +00:00
Jim Shield d2bf1c01bf Force slot to number
For inventories that report slot number as a string, this forces it to a number
2025-11-01 22:48:18 +00:00
Jim Shield 8f31c740bc Update cameras.lua 2025-10-29 03:05:10 +00:00
Jim Shield f9b9de0b57 Make distExploitCheck() more verbose
When accessing a shop or stash will now attempt to print the nearest coordinates it can find and how far the player is from it

This is more a debugging thing
2025-10-27 21:39:13 +00:00
Jim Shield 6f0949da21 Fix crafting allowing movement with progressBar 2025-10-26 21:28:14 +00:00
Jim Shield 27a0e147fb Add exploit check for removing items
Add a check for if a person is attempting to trigger remove minus of an item (possibly trying to give them selves items)

this will stop it in its tracks and warn the server console what happened
2025-10-24 21:40:26 +01:00
Jim Shield 960f73ad6d Actual working checks for hasJob()
`goto skip` is weird.
2025-10-24 14:25:17 +01:00
Jim Shield 18ecc1429e as nil value check for hasJob() function
Should now properly check if the player hasn't got `playerData` from loading in fully and just return that they don't have the requested job
2025-10-24 13:23:05 +01:00
21 changed files with 2326 additions and 169 deletions

No files matched your search

+372
View File
@@ -0,0 +1,372 @@
### pedTasks.lua
This module wraps the GTA V `Task*` natives so scripted peds can be given orders without having to remember each native's argument list.
Every task is registered against its ped, so it can be queried and cancelled later. Finite tasks accept an `onComplete` callback and an optional `timeout`, and every function returns `false, "reason"` when it cannot run.
Coordinates can be passed as a `vector3`, a `vector4`, a plain `{x=,y=,z=}` table, or an entity handle, and are normalised automatically.
> ⚠️ **The ped must not be frozen.** GTA ignores movement and animation tasks on a frozen
> ped, so create peds with `makePed(..., freeze = false, ...)` or call
> `FreezeEntityPosition(ped, false)` before giving them tasks.
> ⚠️ **Peds need a weapon and `canShoot`** before `pedTaskShootAt` will make them fire.
> Use `GiveWeaponToPed(ped, `WEAPON_PISTOL`, 50, false, true)` and
> `pedCombatAttributes(ped, { canShoot = true, canAim = true })`.
> GTA also refuses to let a ped fire unless it is already aiming, so pass `aim = true`
> or call `pedTaskAimAt` first.
#### Movement
- **pedTaskGoTo(ped, coords, opts)**
- Sends a ped to walk or run to a set of coordinates. The task completes once the ped is within `opts.radius` of the destination.
- **Options:** `run`, `speed`, `radius`, `heading`, `slide`, `nativeTimeout`, `timeout`, `onComplete`, `onTimeout`
- **Example:**
```lua
pedTaskGoTo(ped, vec3(455.0, -975.0, 30.0), {
run = true,
onComplete = function(p) print("arrived") end,
})
```
- **pedTaskGoToEntity(ped, target, opts)**
- Sends a ped towards an entity for a set time or until it is within range.
- **Options:** `duration`, `distance`, `speed`, `run`
- **Example:**
```lua
pedTaskGoToEntity(ped, vehicle, { run = true })
```
- **pedTaskFollow(ped, target, opts)**
- Makes a ped follow another entity at a set offset. Completes when the ped catches up.
- **Options:** `offset`, `run`, `speed`, `radius`, `nativeTimeout`, `timeout`, `onComplete`, `onTimeout`
- **Example:**
```lua
pedTaskFollow(ped, targetPed, { offset = vec3(2.0, 0.0, 0.0), run = true })
```
- **pedTaskWander(ped, coords, opts)**
- Sends a ped wandering randomly inside a radius. Continuous task, no completion callback.
- **Options:** `radius`, `length`, `betweenWalks`
- **Example:**
```lua
pedTaskWander(ped, vec3(455.0, -975.0, 30.0), { radius = 10.0 })
```
- **pedTaskFlee(ped, threat, opts)**
- Makes a ped run away from a threat, which can be an entity or a set of coordinates.
- **Options:** `distance`, `time`, `timeout`, `onComplete`, `onTimeout`
- **Example:**
```lua
pedTaskFlee(ped, threatPed, { distance = 60.0 })
```
- **pedTaskFace(ped, target, opts)**
- Makes a ped turn to face an entity, or to reach a heading in degrees.
- **Options:** `duration`
- **Example:**
```lua
pedTaskFace(ped, targetPed)
```
#### Vehicles
- **pedTaskEnterVehicle(ped, vehicle, opts)**
- Tells a ped to get into a vehicle. Completes once the ped is seated.
- **Options:** `seat` ("any", "driver", "passenger", "rearLeft", "rearRight"), `speed`, `flag` ("normal", "teleportToVehicle", "carjackFromSeat", "teleportDirectly"), `nativeTimeout`, `timeout`, `onComplete`, `onTimeout`
- **Example:**
```lua
pedTaskEnterVehicle(ped, vehicle, { seat = "driver" })
```
- **pedTaskLeaveVehicle(ped, opts)**
- Tells a ped to get out of a vehicle. Completes once the ped is out.
- **Options:** `vehicle`, `flag` ("normal", "normalSlow", "keepDoorOpen", "teleportOutside", "throwOutOfVehicle", "moveToPassengerFirst"), `timeout`, `onComplete`, `onTimeout`
- **Example:**
```lua
pedTaskLeaveVehicle(ped)
```
- **pedTaskOpenDoor(ped, vehicle, door, opts)**
- Tells a ped to open a vehicle door. GTA opens the door nearest to the given seat, so use seat names rather than door names. Asking for "driver" may still open the passenger door if that one is closer.
- **Options:** `speed`, `nativeTimeout`, `timeout`, `onComplete`
- **Example:**
```lua
pedTaskOpenDoor(ped, vehicle, "passenger")
```
- **pedCloseDoor(vehicle, door, opts)**
- Closes a vehicle door. GTA has no "close door" task, so this uses the door native directly.
- **Options:** `instant` (snap it shut), `ped` (a ped whose tasks should be cancelled first, so they stop fighting the close)
- **Example:**
```lua
pedCloseDoor(vehicle, "passenger", { ped = ped })
```
- **pedTaskDriveTo(ped, vehicle, coords, opts)**
- Makes a ped drive a vehicle to a set of coordinates.
- **Options:** `speed`, `drivingMode`, `model`, `stopRange`, `timeout`, `onComplete`, `onTimeout`
- **Example:**
```lua
pedTaskDriveTo(ped, vehicle, vec3(100.0, 200.0, 30.0))
```
- **pedTaskPark(ped, vehicle, coords, opts)**
- Makes a ped park a vehicle at a set of coordinates.
- **Options:** `heading`, `mode` ("ignoreHeading", "forward", "reverse"), `radius`, `keepEngineOn`, `timeout`, `onComplete`, `onTimeout`
- **Example:**
```lua
pedTaskPark(ped, vehicle, vec3(100.0, 200.0, 30.0), { heading = 90.0 })
```
- **pedTaskChase(ped, target)**
- Makes a ped in a vehicle chase another entity. Continuous task.
- **Example:**
```lua
pedTaskChase(ped, targetVehicle)
```
#### Combat
- **pedTaskCombat(ped, target, opts)**
- Sends a ped to attack a target. Continuous task.
- **Options:** `style` ("melee" or "ranged")
- **Example:**
```lua
pedTaskCombat(ped, targetPed, { style = "melee" })
```
- **pedTaskShootAt(ped, target, opts)**
- Makes a ped shoot at an entity or a set of coordinates. Continuous task.
- **Options:** `duration`, `pattern` (e.g. "FIRING_PATTERN_FULL_AUTO"), `aim` (aim at the target first, required for the ped to actually fire)
- **Example:**
```lua
pedTaskShootAt(ped, targetPed, { pattern = "FIRING_PATTERN_BURST_FIRE", aim = true })
```
- **pedTaskAimAt(ped, target, opts)**
- Makes a ped aim a weapon at an entity or a set of coordinates. Continuous task.
- **Options:** `duration`, `instant`, `intro`
- **Example:**
```lua
pedTaskAimAt(ped, vec3(100.0, 200.0, 30.0))
```
- **pedTaskAccuracy(ped, level)**
- Sets how accurate a ped is when shooting, `0` is poor and `100` is perfect.
- **Example:**
```lua
pedTaskAccuracy(ped, 80)
```
- **pedTaskFiringPattern(ped, pattern)**
- Sets the firing pattern a ped uses, by name or hash.
- **Example:**
```lua
pedTaskFiringPattern(ped, "FIRING_PATTERN_BURST_FIRE")
```
#### Animation
- **pedTaskPlayAnim(ped, dict, anim, opts)**
- Plays an animation on a ped. Completes once the animation has finished, unless `opts.loop` is set.
- **Options:** `blendIn`, `blendOut`, `duration`, `flag` ("looping", "holdLastFrame", "repositionWhenFinished", "notInterruptable", "upperBody"), `playbackRate`, `lock`, `loop`, `timeout`, `onComplete`, `onTimeout`
- **Example:**
```lua
pedTaskPlayAnim(ped, "amb@world_human_clipboard@male@idle_a", "idle_c")
```
- **pedTaskScenario(ped, scenario, opts)**
- Starts a scenario on a ped, such as a sitting or leaning animation. Continuous task.
- **Options:** `duration`, `intro`
- **Example:**
```lua
pedTaskScenario(ped, "WORLD_HUMAN_STAND_IMPATIENT")
```
- **pedTaskLookAt(ped, target, opts)**
- Makes a ped look at an entity or a set of coordinates.
- **Options:** `duration`
- **Example:**
```lua
pedTaskLookAt(ped, targetPed, { duration = 3000 })
```
- **pedTaskRagdoll(ped, duration, opts)**
- Makes a ped ragdoll for a set duration.
- **Options:** `type`
- **Example:**
```lua
pedTaskRagdoll(ped, 3000)
```
- **pedTaskStandStill(ped, duration)**
- Makes a ped stand still for a set duration.
- **Example:**
```lua
pedTaskStandStill(ped, 3000)
```
#### Behaviour
- **pedCombatAttributes(ped, opts)**
- Sets what a ped is allowed to do in combat. The native takes one attribute at a time, so every option provided is applied individually and anything left out is not changed.
- **Options:** any of `alwaysFight`, `canShoot`, `canAim`, `canUseCover`, `aggressive`, `perfectAccuracy`, `disableFleeFromCombat`, `canFlank`, `canCharge` and the rest of the game's combat attributes.
- **Example:**
```lua
pedCombatAttributes(ped, { alwaysFight = true, canShoot = true, canUseCover = true })
```
- **pedFleeAttributes(ped, opts)**
- Sets what a ped is allowed to do when it is fleeing. The native takes a bitmask, so each attribute is applied as `1 << bit`.
- FiveM only documents bit `15` as "force cower", the rest follow the game's flee attribute ordering. Use `pedSetFleeAttribute` if you need a specific bit.
- **Example:**
```lua
pedFleeAttributes(ped, { [15] = true })
```
- **pedSetFleeAttribute(ped, bit, enabled)**
- Sets a single flee attribute on a ped by its bit position.
- **Example:**
```lua
pedSetFleeAttribute(ped, 15, true)
```
- **pedCombatRange(ped, range)**
- Sets how far a ped will engage in combat. Accepts "melee", "preferred", "far" or a raw value 0-2.
- **Example:**
```lua
pedCombatRange(ped, "melee")
```
- **pedCombatAbility(ped, level)**
- Sets how well a ped fights, from `0` (poor) to `4` (very good).
- **Example:**
```lua
pedCombatAbility(ped, 3)
```
- **pedCombatMovement(ped, mode)**
- Sets how a ped moves while fighting. Accepts "hold", "strafe", "advance" or a raw value 0-2.
- **Example:**
```lua
pedCombatMovement(ped, "strafe")
```
- **pedSetConfigFlag(ped, flag, value)** / **pedGetConfigFlag(ped, flag)**
- Reads and writes raw ped config flags, for anything the helpers above do not cover.
- **Example:**
```lua
pedSetConfigFlag(ped, 17, true) -- block non temporary events
```
- **pedState(ped, opts)**
- Sets a group of general states on a ped. Only the options provided are applied.
- **Options:** `invincible`, `canRagdoll`, `dropsWeapons`, `criticalHits`, `canSwitchWeapon`, `drunk`, `armour`, `health`, `canBeDamaged`, `blocksEvents`, `moveRate`, `density`
- **Example:**
```lua
pedState(ped, { invincible = true, canRagdoll = false, armour = 100 })
```
#### Tracking
- **pedTaskStatus(ped)**
- Returns the name of the task currently assigned to a ped, or nil.
- **Example:**
```lua
if pedTaskStatus(ped) == "goTo" then print("on the move") end
```
- **pedTaskIsRunning(ped, name)**
- Checks if a named task is currently assigned to a ped.
- **Example:**
```lua
if pedTaskIsRunning(ped, "combat") then print("fighting") end
```
- **pedTaskActive(ped, index)**
- Checks if a native task is active on a ped by its task index.
- **Example:**
```lua
if pedTaskActive(ped, pedTaskWanderIndex()) then print("wandering") end
```
- **pedTaskWanderIndex()**
- Returns the native task index used by the wander task, for use with `pedTaskActive`.
- **pedTaskCancel(ped, name)**
- Cancels a task on a ped. GTA has no per task cancellation, so the ped's whole task queue is cleared. The name confirms the task is still the one running first.
- **Example:**
```lua
pedTaskCancel(ped, "goTo")
```
- **pedTaskClear(ped)**
- Clears every task on a ped and resets its tracking.
- **Example:**
```lua
pedTaskClear(ped)
```
- **pedTaskWait(ped, condition, opts)**
- Waits for a condition to become true for a ped. Useful for chaining tasks together without a separate script thread.
- **Options:** `timeout`, `interval`, `onComplete`, `onTimeout`
- **Example:**
```lua
pedTaskWait(ped, function(p) return #(GetEntityCoords(p) - target) < 3.0 end, {
onComplete = function(p) pedTaskPlayAnim(p, "dict", "anim") end,
})
```
#### Chaining tasks together
```lua
pedTaskGoTo(ped, coords, {
run = true,
onComplete = function(p)
pedTaskPlayAnim(p, "amb@world_human_clipboard@male@idle_a", "idle_c", {
onComplete = function(p2)
pedTaskGoTo(p2, coords2)
end,
})
end,
})
```
+1 -1
View File
@@ -462,7 +462,7 @@ local invWeightTable = {
[Exports.PSInv] = { file = "config.lua", path = { "MaxInventoryWeight" }, slotPath = { "MaxInventorySlots" } },
[Exports.TgiannInv] = { file = "configs/config.lua", path = { "slotsMaxWeights", "player", "maxWeight" }, slotPath = { "slotsMaxWeights", "player", "slots" } },
[Exports.CodeMInv] = { file = "config/config.lua", path = { "MaxWeight" }, slotPath = { "MaxSlots" } },
[Exports.RSGInv] = { file = "config/config.lua", path = { "MaxWeight" }, slotPath = { "MaxSlots" } },
[Exports.RSGInv] = { file = "shared/config.lua", path = { "MaxWeight" }, slotPath = { "MaxSlots" } },
--[Exports.OrigenInv] = { file = "config.lua", path = { "MaxWeight" } },
}
+5 -1
View File
@@ -1,6 +1,6 @@
name "Jim_Bridge"
author "Jimathy"
version "2.1.08"
version "2.1.09"
description "Framework Bridge By Jimathy"
fx_version "cerulean"
rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.'
@@ -11,7 +11,11 @@ files {
'starter.lua',
'shared/*.lua',
'shared/make/*.lua',
'shared/auth/*.lua',
'shared/make/*.lua',
'shared/modules/*.lua',
'shared/scaleforms/*.lua',
'shared/wrappers/*.lua',
}
-- Version checker
+18 -8
View File
@@ -137,21 +137,31 @@ function distExploitCheck(table, src)
return false
end
local maxDist = 10.0
local nearestDist = 999999.0
local nearestCoords = nil
local ped = src and GetPlayerPed(src) or PlayerPedId()
local srcCoords = GetEntityCoords(ped)
local allow = false
for i = 1, #table do
if #(table[i].xy - srcCoords.xy) <= 10 then
local dist2d = #(table[i].xy - srcCoords.xy)
-- Track the nearestDist
if dist2d < nearestDist then
nearestDist = dist2d
nearestCoords = table[i]
end
if dist2d <= maxDist then
debugPrint("^1Found location^7: ^3"..nearestDist.." ^7away from player - "..formatCoord(nearestCoords))
return true
else
allow = false
end
end
if not allow then
print(src and ("^1Src ^3"..src.." ") or "", "^1Tried to open a registered shop/stash from over the distance limit^7")
return false
end
print(src and ("^1Src ^3"..src.." ") or "", "^1Tried to open a registered shop/stash from over the distance limit^7")
print("^1Nearest Possible Location^7: ^3"..nearestDist.." ^7away from player - "..formatCoord(nearestCoords))
return false
end
+3 -3
View File
@@ -57,8 +57,8 @@ function RegisterNetEvent(name, funct)
end
function TriggerEvent(name, ...)
local data = {...}
if Config.System.EventDebug then
local data = {...}
if name:find("__cfx_export") then
print("^6Bridge^7: "..GetPrintTime().." ^2Triggering ^3"..(isServer() and "Server" or "Client").." ^2Export^7: ^6"..name:gsub("__cfx_export_", ""):gsub("%:", "^7:^4").."^7"..getDebugInfo(debug.getinfo(2, "nSl")))
else
@@ -74,8 +74,8 @@ function TriggerEvent(name, ...)
end
function TriggerServerEvent(name, ...) -- Client side, trigger a server event
local data = {...}
if Config.System.EventDebug then
local data = {...}
if name:find("__ox_cb") then
print("^6Bridge^7: "..GetPrintTime().." ^2Triggered ^3Server ^2Callback: ^6"..name:gsub("__ox_cb_", "").."^7"..getDebugInfo(debug.getinfo(2, "nSl")))
else
@@ -91,8 +91,8 @@ function TriggerServerEvent(name, ...) -- Client side, trigger a server event
end
function TriggerClientEvent(name, ...) -- Server side, trigger a client event
local data = {...}
if Config.System.EventDebug then
local data = {...}
if name:find("__ox_cb") then
print("^6Bridge^7: "..GetPrintTime().." ^2Triggered ^3Client ^2Callback: ^6"..name:gsub("__ox_cb_", "").."^7"..getDebugInfo(debug.getinfo(2, "nSl")))
else
+3 -2
View File
@@ -33,8 +33,9 @@ if not SUPPRESS_UPDATES then
end
local scriptName = ("^2"..capitalize(getScript()):gsub("%-", "^7-^2"):gsub("%_", "^7_^2")) or ""
local scriptVersion = ("^5"..GetResourceMetadata(getScript(), 'version', nil):gsub("%.", "^7.^5")) or ""
local scriptDescription = ("^2"..GetResourceMetadata(getScript(), 'description', nil)) or ""
local rawVersion = GetResourceMetadata(getScript(), 'version', nil) or "?"
local scriptVersion = ("^5"..rawVersion:gsub("%.", "^7.^5")) or ""
local scriptDescription = ("^2"..(GetResourceMetadata(getScript(), 'description', nil) or "")) or ""
local scriptAuthor = ("^2by ^4"..GetResourceMetadata(getScript(), 'author', nil):gsub("%and", "^7and^4")) or ""
print(scriptName.." ^7v"..scriptVersion.."^7 - "..scriptDescription.." "..scriptAuthor.."^7")
+105
View File
@@ -0,0 +1,105 @@
-- Client Item Registry
-- ---------------------------------------------------------------------------
-- Dynamically derived list of items a client is allowed to request through the
-- ":server:toggleItem" net event.
--
-- There is no hardcoded item list. The registry is built once, on first use,
-- from the host resource's own tables:
--
-- * Crafting - recipe results and ingredients
-- * Stores - shop item definitions ({ name = "item" })
-- * MaterialRecieve - material returns
-- * createUseableItem() registrations
-- * allowClientItem() calls
--
-- Because it reads the script's existing definitions, adding a new recipe or
-- shop item automatically makes it grantable. Servers do not need to maintain
-- a second list.
--
-- Items that are not found in any of the above are refused.
-- ---------------------------------------------------------------------------
ClientItemAllowlist = ClientItemAllowlist or {}
ClientItemUseable = ClientItemUseable or {}
local built = false
--- Default maximum a client may request of a dynamically discovered item.
ClientItemDefaultMax = ClientItemDefaultMax or 10
local function add(item, max)
if type(item) ~= "string" or item == "" then return end
if ClientItemAllowlist[item] == nil then
ClientItemAllowlist[item] = tonumber(max) or ClientItemDefaultMax
end
end
-- Walks a table and treats every string key and string value as a candidate
-- item name. Non-item strings are harmless because the caller still runs
-- doesItemExist() before granting anything.
local function scan(tbl, seen, depth)
if type(tbl) ~= "table" or seen[tbl] then return end
if depth and depth > 12 then return end
seen[tbl] = true
for k, v in pairs(tbl) do
if type(k) == "string" then add(k) end
if type(v) == "table" then
scan(v, seen, (depth or 0) + 1)
elseif type(v) == "string" then
add(v)
end
end
end
--- Builds the registry from whatever item tables the host resource exposes.
local function build()
if built then return end
built = true
local seen = {}
if type(Crafting) == "table" then scan(Crafting, seen, 0) end
if type(Stores) == "table" then scan(Stores, seen, 0) end
if type(MaterialRecieve) == "table" then scan(MaterialRecieve, seen, 0) end
-- Scripts keep item names in Config too (shops, sell tables, processing).
-- This is what makes the registry follow each server's own configuration.
if type(Config) == "table" then scan(Config, seen, 0) end
for item in pairs(ClientItemUseable) do add(item) end
local count = 0
for _ in pairs(ClientItemAllowlist) do count = count + 1 end
debugPrint("^6Bridge^7: ^2Client item registry built for ^3"..tostring(getScript()).."^7 - ^6"..count.."^7 entries")
if count == 0 then
print("^6Bridge^7: ^3"..tostring(getScript()).." ^1has no item definitions to build a client registry from^7.")
print("^6Bridge^7: ^1Client-side addItem/removeItem grants are disabled for this resource^7.")
print("^6Bridge^7: ^2Call ^3allowClientItem(\"item_name\", maxAmount)^2 if this resource needs them^7.")
end
end
--- Registers an item as client-grantable. Use this for items that are not
--- covered by the host resource's Crafting/Stores/MaterialRecieve tables.
--- @param item string
--- @param maxAmount number|nil
function allowClientItem(item, maxAmount)
if type(item) ~= "string" or item == "" then return end
ClientItemAllowlist[item] = tonumber(maxAmount) or ClientItemDefaultMax
end
--- Records an item registered through createUseableItem().
--- @param item string
function registerClientUseableItem(item)
if type(item) == "string" and item ~= "" then
ClientItemUseable[item] = true
end
end
--- Returns the maximum amount a client may request, or nil if not allowed.
--- Triggers the one-time build on first call.
--- @param item string
--- @return number|nil
function isClientItemAllowed(item)
if not built then build() end
return ClientItemAllowlist[item]
end
+6 -2
View File
@@ -121,7 +121,7 @@ function craftingMenu(data)
for k, v in pairs(Recipes[i]) do
if not excludeKeys[k] then
if not Recipes[i].amount then Recipes[i].amount = 1 end
tempCarryTable[k] = tempCarryTable[k] and (tempCarryTable[k] < Recipes[i].amount) or Recipes[i].amount
tempCarryTable[k] = math.max(tempCarryTable[k] or 0, Recipes[i].amount)
end
end
end
@@ -434,6 +434,7 @@ function makeItem(origData)
anim = "putdown_low",
flag = 49,
icon = k,
disableMovement = true,
}) then
TriggerEvent((isStarted(QBInv) and QBInvNew and "qb-" or "")..'inventory:client:ItemBox', Items[k], "use", v)
else
@@ -455,6 +456,7 @@ function makeItem(origData)
anim = anim,
flag = 49,
icon = data.item,
disableMovement = true,
request = true,
}) then
TriggerServerEvent(getScript()..":Crafting:GetItem", data.item, data.craft, data.stashName, metadata, currentToken)
@@ -487,6 +489,7 @@ function makeItem(origData)
anim = anim,
flag = 49,
icon = data.item,
disableMovement = true,
request = true,
}) then
data.craft.amount *= craftAmount
@@ -593,4 +596,5 @@ RegisterNetEvent(getScript()..":Crafting:GetItem", function(ItemMake, craftable,
-- Optionally, add experience here:
-- for example:
-- if isStarted("core_skills") then exports["core_skills"]:AddExperience(src, 2) end
end)
end)
+157 -54
View File
@@ -1489,6 +1489,10 @@ end
--- ```
function createUseableItem(item, funct)
if doesItemExist(item) then
-- Record it in the client item registry. Items a script makes usable are
-- part of its own item definitions, so this keeps the registry dynamic.
if registerClientUseableItem then registerClientUseableItem(item) end
local useableFunc = {
{ framework = ESXExport,
func = function(item, funct)
@@ -1621,74 +1625,78 @@ end
--- ```
local MAX_ITEM_REQUEST = 1000
RegisterNetEvent(getScript()..":server:toggleItem", function(give, item, amount, newsrc, info, slot, token)
local excludeRes = {
[QBExport] = true,
[ESXExport] = true,
[VorpExport] = true,
}
local invokingRes = GetInvokingResource()
--debugPrint(GetInvokingResource())
if invokingRes and invokingRes ~= getScript() and not excludeRes[invokingRes] then
-- A client-triggered net event has no invoking resource.
local invokingRes = GetInvokingResource()
local isClient = (invokingRes == nil or invokingRes == "")
-- Server-side callers must be this resource or an allowed core.
if not isClient and invokingRes ~= getScript() and not excludeRes[invokingRes] then
debugPrint("^1Error^7: ^1Possible exploit^7, ^1vital function was called from an external resource^7")
return
end
if not doesItemExist(item) then
print("^1Error^7 - ^2Tried to "..(tostring(give) == "true" and "add" or "remove").." '^3"..item.."^7' but it doesn't exist")
if type(item) ~= "string" or not doesItemExist(item) then
print("^1Error^7 - ^2Tried to "..(give and "add" or "remove").." '^3"..tostring(item).."^7' but it doesn't exist")
return
end
local src = (newsrc and tonumber(newsrc)) or source
local giveItem = (give == true or give == 1)
if (give == true or give == 1) then
if newsrc == nil then -- this must be coming from client this would be blank
-- Resolve the target. Clients may only ever affect themselves.
local src
if isClient then
src = source
if not src or src <= 0 then return end
if newsrc ~= nil then
print("^1Exploit^7: ^3"..tostring(src).." ^1tried to target another player through toggleItem^7")
return
end
else
src = (newsrc and tonumber(newsrc)) or source
end
if not src or src <= 0 then return end
-- Bound and validate the amount.
local reqAmount = tonumber(amount) or 1
if reqAmount ~= math.floor(reqAmount) or reqAmount <= 0 or reqAmount > MAX_ITEM_REQUEST then
print("^1Exploit^7: ^3"..tostring(src).." ^1sent an invalid amount to toggleItem^7: "..tostring(amount).." ("..(giveItem and "add" or "remove").." "..item..")")
return
end
if type(info) ~= "table" then info = nil end
if type(slot) ~= "number" then slot = nil end
local action = giveItem and "addItem" or "removeItem"
local invName = ""
if giveItem then
if isClient then
-- Single-use token (10 second expiry).
if not checkToken(src, token, "item", item) then
return
end
end
end
local action = (tostring(give) == "true" and "addItem" or "removeItem")
local remamount = amount or 1
if item == nil then return end
local invName = ""
if give == 0 or give == false then
if not hasItem(item, amount or 1, src) then
dupeWarn(src, item, amount)
else
for i = 1, #InvFunc do
local inv = InvFunc[i]
if isStarted(inv.invName) then
invName = inv.invName
inv.removeItem(src, item, remamount)
break
end
-- Only items this resource actually defines may be granted.
local allowedMax = isClientItemAllowed(item)
if not allowedMax then
print("^1Exploit^7: ^3"..tostring(src).." ^1requested ^3"..item.." ^1via toggleItem but it is not in this resource's item registry^7")
return
end
-----
-- Fallback for if no inventory found:
-----
if invName == "" then
print("^4ERROR^7: No Supported Inventory detected - ^2Falling back to core functions")
if isStarted(QBExport) or isStarted(QBXExport) then -- if qbcore or qbxcore, just use core functions
invName = isStarted(QBXExport) and QBXExport or isStarted(QBExport) and QBExport
Core.Functions.GetPlayer(src).Functions.RemoveItem(item, remamount, slot)
elseif ESX and isStarted(ESXExport) then -- if esx then use core functions
invName = ESX
ESX.GetPlayerFromId(src).removeInventoryItem(item, remamount)
end
else
debugPrint("^6Bridge^7: ^3"..action.."^7[^6"..invName.."^7] Player(^3"..src.."^7) "..getItemLabel(item).."("..item..") x"..(amount or 1))
if reqAmount > allowedMax then
print("^1Exploit^7: ^3"..tostring(src).." ^1requested x"..reqAmount.." of ^3"..item.." ^1(max ^3"..allowedMax.."^7)")
return
end
end
else
local amountToAdd = amount or 1
local amountToAdd = reqAmount
for i = 1, #InvFunc do
local inv = InvFunc[i]
if isStarted(inv.invName) then
@@ -1709,7 +1717,39 @@ RegisterNetEvent(getScript()..":server:toggleItem", function(give, item, amount,
ESX.GetPlayerFromId(src).addInventoryItem(item, amountToAdd)
end
else
debugPrint("^6Bridge^7: ^3"..action.."^7[^6"..invName.."^7] Player(^3"..src.."^7) "..getItemLabel(item).."("..item..") x"..(amount or 1))
debugPrint("^6Bridge^7: ^3"..action.."^7[^6"..invName.."^7] Player(^3"..src.."^7) "..getItemLabel(item).."("..item..") x"..amountToAdd)
end
else
if not hasItem(item, reqAmount, src) then
dupeWarn(src, item, amount)
else
for i = 1, #InvFunc do
local inv = InvFunc[i]
if isStarted(inv.invName) then
invName = inv.invName
inv.removeItem(src, item, reqAmount)
break
end
end
-----
-- Fallback for if no inventory found:
-----
if invName == "" then
print("^4ERROR^7: No Supported Inventory detected - ^2Falling back to core functions")
if isStarted(QBExport) or isStarted(QBXExport) then -- if qbcore or qbxcore, just use core functions
invName = isStarted(QBXExport) and QBXExport or isStarted(QBExport) and QBExport
Core.Functions.GetPlayer(src).Functions.RemoveItem(item, reqAmount, slot)
elseif ESX and isStarted(ESXExport) then -- if esx then use core functions
invName = ESX
ESX.GetPlayerFromId(src).removeInventoryItem(item, reqAmount)
end
else
debugPrint("^6Bridge^7: ^3"..action.."^7[^6"..invName.."^7] Player(^3"..src.."^7) "..getItemLabel(item).."("..item..") x"..reqAmount)
end
end
end
end)
@@ -1728,8 +1768,11 @@ end)
--- dupeWarn(playerId, "health_potion")
--- ```
function dupeWarn(src, item, message)
local name = getPlayer(src).name
print(message or "^5DupeWarn^7: "..name.." (^1"..tostring(src).."^7) ^2Tried to remove item '^3"..item.."^7'^2 but it wasn't there^7")
src = tonumber(src)
if not src or src <= 0 then return end
local player = getPlayer(src)
local name = (player and player.name) or ("Unknown("..tostring(src)..")")
print(message or "^5DupeWarn^7: "..name.." (^1"..tostring(src).."^7) ^2Tried to remove item '^3"..tostring(item).."^7'^2 but it wasn't there^7")
if not debugMode then
DropPlayer(src, name.."("..tostring(src)..") kicked by exploit protection")
end
@@ -1803,6 +1846,7 @@ function getItemMetadata(item, slot, src)
if chosenSlot then
for k, v in pairs(itemcheck) do
v.slot = tonumber(v.slot)
if v.name == item and v.slot == chosenSlot then
lowestSlot = v.slot
metadata = itemcheck[k].info or itemcheck[k].metadata or {}
@@ -1811,6 +1855,7 @@ function getItemMetadata(item, slot, src)
end
else
for k, v in pairs(itemcheck) do
v.slot = tonumber(v.slot)
if v.name == item then
if v.slot <= lowestSlot then
lowestSlot = v.slot
@@ -2677,7 +2722,7 @@ function sellMenu(data)
onSelect = function()
local token = triggerCallback(AuthEvent)
sellAnim({ item = k, price = v, ped = data.ped, onBack = function() sellMenu(data) end }, token)
sellAnim({ item = k, price = v, ped = data.ped, shopName = data.name, onBack = function() sellMenu(data) end }, token)
end,
}
end
@@ -2770,8 +2815,37 @@ local bannedItems = {
markedbills = true
}
-- Server-defined sell price registry
-- Supports per-shop pricing: { [shopName] = { [itemName] = price } }
-- Or global pricing: { [itemName] = price }
-- Use registerSellPrice() to register prices from your shop configs
local sellPriceRegistry = {}
-- Register sell price for an item at a specific shop
-- Usage: registerSellPrice("shopName", "item_name", 50)
-- Usage: registerSellPrice(nil, "item_name", 50) -- nil = global price
function registerSellPrice(shopName, itemName, price)
sellPriceRegistry[tostring(shopName)] = sellPriceRegistry[tostring(shopName)] or {}
sellPriceRegistry[tostring(shopName)][tostring(itemName)] = tonumber(price)
debugPrint("^6Bridge^7: ^2Registered price^7: ^3"..tostring(itemName).."^7[^3"..tostring(price).."^7] - "..tostring(shopName or "global").."^7")
end
-- Get sell price from registry (checks per-shop first, then global)
function GetSellPrice(shopName, itemName)
-- Check for per-shop price (only if shopName is not nil/empty)
if shopName and shopName ~= "" then
local shopPrices = sellPriceRegistry[tostring(shopName)]
if shopPrices then
return shopPrices[tostring(itemName)]
end
end
-- Fallback to global registry (no shop specified, or shop not found in registry)
return sellPriceRegistry[tostring(itemName)]
end
--- Server event handler for processing item sales.
--- Removes sold items from inventory and funds the player based on the sale.
--- Uses server-defined prices from the registry, ignoring client-supplied price.
RegisterNetEvent(getScript()..":Sellitems", function(data, token)
local src = source
@@ -2789,18 +2863,47 @@ RegisterNetEvent(getScript()..":Sellitems", function(data, token)
local hasItems, hasTable = hasItem(data.item, 1, src)
if hasItems then
removeItem(data.item, hasTable[data.item].count, src)
print((hasTable[data.item].count * data.price), data.price)
fundPlayer((hasTable[data.item].count * data.price), "cash", src)
-- FIX: Use server-defined price from registry, NOT client-supplied data.price
-- data.shopName comes from sellMenu's 'name' parameter
local pricePerUnit = GetSellPrice(data.shopName, data.item)
if not pricePerUnit then
debugPrint("^1ERROR^7: No sell price registered for item: ^3"..data.item.."^7 at shop: ^3"..tostring(data.shopName or "global"))
-- Try to find available prices for debugging
for shop, items in pairs(sellPriceRegistry) do
if items[tostring(data.item)] then
debugPrint("^6Available price for "..data.item..": ^7at shop ^3"..shop)
end
end
triggerNotify(nil, "This item cannot be sold", "error", src)
return
end
local totalPrice = hasTable[data.item].count * pricePerUnit
fundPlayer(totalPrice, "cash", src)
triggerNotify(nil, "Sold "..hasTable[data.item].count.."x "..data.item.." for $"..cv(totalPrice), "success", src)
else
triggerNotify(nil, Loc[Config.Lan].error["dont_have"].." "..getItemLabel(data.item), "error", src)
end
end)
function registerSellShop(name, coords)
function registerSellShop(name, coords, items)
if coords then
debugPrint("^6Bridge^7: ^2Registering ^3Sell Store^7: "..name, coords and "- ^4Coord^7: "..formatCoord(coords) or "NO COORD SET")
sellShopExploitCheck[name] = sellShopExploitCheck[name] or {}
sellShopExploitCheck[name][#sellShopExploitCheck[name]+1] = coords
if items then
for k, v in pairs(items) do
if type(v) == "table" then
for l, b in pairs(v.Items) do
registerSellPrice(name, l, b)
end
else
registerSellPrice(name, k, v)
end
end
end
end
end
+1 -1
View File
@@ -19,7 +19,7 @@ local camCache = {}
-- ```
function createTempCam(ent, coords)
local camID = nil
if Config.Crafting?.craftCam or Config.System.enableCam then
if (Config.Crafting and Config.Crafting.craftCam) or Config.System.enableCam then
-- if not ent or coords are provided, make a basic camera to control later
if not ent and not coords then
+15 -10
View File
@@ -1,4 +1,3 @@
local time = 500
--- Loads a specified model into memory.
---
@@ -11,16 +10,22 @@ local time = 500
--- ```lua
--- loadModel('prop_chair_01a')
--- ```
function loadModel(model)
if not IsModelValid(model) then print("^6Bridge^7: ^1ERROR^7: ^2Model^7 - '^6"..model.."^7' ^2does not exist in server") return
else
if not HasModelLoaded(model) then
debugPrint("^6Bridge^7: ^2Loading Model^7: '^6"..model.."^7'")
while not HasModelLoaded(model) and time > 0 do time -= 1 RequestModel(model) Wait(0) end
if not HasModelLoaded(model) then print("^6Bridge^7: ^3LoadModel^7: ^2Timed out loading model ^7'^6"..model.."^7'") end
end
time = 500
function loadModel(model, timeout)
if not IsModelValid(model) then print("^6Bridge^7: ^1ERROR^7: ^2Model^7 - '^6"..model.."^7' ^2does not exist in server") return false end
if HasModelLoaded(model) then return true end
debugPrint("^6Bridge^7: ^2Loading Model^7: '^6"..model.."^7'")
local deadline = GetGameTimer() + (timeout or 10000)
while not HasModelLoaded(model) and GetGameTimer() < deadline do
RequestModel(model)
Wait(0)
end
if not HasModelLoaded(model) then
print("^6Bridge^7: ^3LoadModel^7: ^2Timed out loading model ^7'^6"..model.."^7'")
return false
end
return true
end
--- Unloads a model from memory.
+23 -8
View File
@@ -14,6 +14,8 @@ local distPeds = {}
---@param scenario boolean (optional) String specifying the scenario the Ped should perform.
---@param anim table (optional) A table containing animation dictionary and name `{animDict, animName}`.
---@param synced boolean (optional) Boolean indicating whether the Ped is synced across clients. Default is `false`.
---@param fade boolean (optional) Boolean indicating whether the Ped fades in. Default is `true`.
---@param keepModel boolean (optional) Boolean indicating whether the model stays loaded after the Ped is made. Default is `false`.
--
---@usage
-- ```lua
@@ -58,7 +60,7 @@ end
-- ```lua
-- local ped = makePed(pedData, pedCoords, true, false, nil, {'animDict', 'animName'}, true)
-- ```
function makePed(data, coords, freeze, collision, scenario, anim, synced, fade)
function makePed(data, coords, freeze, collision, scenario, anim, synced, fade, keepModel)
local ped = nil
local model = nil
if type(data) == "table" then
@@ -129,7 +131,7 @@ function makePed(data, coords, freeze, collision, scenario, anim, synced, fade)
SetEntityInvincible(ped, true)
SetBlockingOfNonTemporaryEvents(ped, true)
FreezeEntityPosition(ped, freeze and freeze or true)
FreezeEntityPosition(ped, not (freeze == false))
if collision then SetEntityNoCollisionEntity(ped, PlayerPedId(), false) end
if scenario then TaskStartScenarioInPlace(ped, scenario, 0, true) end
@@ -142,8 +144,9 @@ function makePed(data, coords, freeze, collision, scenario, anim, synced, fade)
else
print("error ped")
end
unloadModel(model)
Peds[keyGen()..keyGen()] = ped
-- if keep model is true, don't unload the model from cache, scripts that spawn alot of the same model end up causing issues.
if not keepModel then unloadModel(model) end
Peds[ped] = ped
if fade ~= false and gameName ~= "rdr3" then
SetEntityAlpha(ped, 0, false)
CreateThread(function()
@@ -248,8 +251,9 @@ function GenerateRandomPedData(data)
end
onPlayerUnload(function()
for k in pairs(Peds) do
DeletePed(Peds[k])
for k, ped in pairs(Peds) do
if DoesEntityExist(ped) then DeletePed(ped) end
Peds[k] = nil
end
for i = 1, #distPeds do
removeZoneTarget(distPeds[i])
@@ -259,7 +263,18 @@ end)
--- Cleans up all created Peds when the resource stops.
onResourceStop(function()
for k in pairs(Peds) do
DeletePed(Peds[k])
for k, ped in pairs(Peds) do
if DoesEntityExist(ped) then DeletePed(ped) end
Peds[k] = nil
end
end, true)
-- Drop the peds that are already gone
CreateThread(function()
while true do
Wait(5000)
for k, ped in pairs(Peds) do
if type(k) == "number" and not DoesEntityExist(ped) then Peds[k] = nil end
end
end
end)
+17 -5
View File
@@ -29,7 +29,7 @@ function makeProp(data, freeze, synced, fade)
debugPrint("^6Bridge^7: ^1Prop ^2Created^7: '^6"..prop.."^7' | ^2Hash^7: ^7'^6"..data.prop.."^7' | ^2Coord^7: "..formatCoord(data.coords))
SetModelAsNoLongerNeeded(data.prop)
Props[keyGen()..keyGen()] = prop
Props[prop] = prop
if fade ~= false and gameName ~= "rdr3" then
SetEntityAlpha(prop, 0, false)
CreateThread(function()
@@ -94,12 +94,14 @@ function destroyProp(entity)
DetachEntity(entity, true, true)
end
DeleteObject(entity)
Props[entity] = nil
end
end
onPlayerUnload(function()
for k in pairs(Props) do
DeleteObject(Props[k])
for k, prop in pairs(Props) do
if DoesEntityExist(prop) then DeleteObject(prop) end
Props[k] = nil
end
for i = 1, #distProps do
removeZoneTarget(distProps[i])
@@ -109,7 +111,17 @@ end)
--- Cleans up all created props when the resource stops.
onResourceStop(function()
for k in pairs(Props) do
destroyProp(Props[k])
for k, prop in pairs(Props) do
destroyProp(prop)
end
end, true)
-- Drop the props that are already gone
CreateThread(function()
while true do
Wait(5000)
for k, prop in pairs(Props) do
if type(k) == "number" and not DoesEntityExist(prop) then Props[k] = nil end
end
end
end)
File diff suppressed because it is too large. Load diff
+1 -1
View File
@@ -122,7 +122,7 @@ function GetPlayer(source)
return framework.GetPlayer(source)
end
end
return nil
return {}
end
-------------------------------------------------------------
+6 -1
View File
@@ -111,11 +111,16 @@ local notifyFunc = {
--- triggerNotify("Alert", "You have been warned for misconduct.", "error", playerId)
--- ```
function triggerNotify(title, message, type, src)
if not Config.System?.Notify then debugPrint("Notify triggered but not set up") return end
if not Config or not Config.System or not Config.System.Notify then
print("Notify triggered but not set up")
return
end
if src then
if Config.System.EventDebug then print(tostring(title).." - "..tostring(message).." - "..tostring(type).." - "..tostring(src)) end
notifyFunc[Config.System.Notify].server(title, message, type, src)
else
if Config.System.EventDebug then print(tostring(title).." - "..tostring(message).." - "..tostring(type).." - "..tostring(src)) end
notifyFunc[Config.System.Notify].client(title, message, type)
end
end
+76 -64
View File
@@ -359,7 +359,7 @@ function fundPlayer(fund, moneyType, newsrc)
local framework = moneyFunc[i]
if framework.framework == OXInv and moneyType == "bank" then goto skip end
if isStarted(framework.framework) then
debugPrint("^6Bridge^7: ^2Funding ^3"..framework.framework.." ^2Player^7: '^6"..fund.."^7'", moneyType)
debugPrint("^6Bridge^7: ^2Funding ^3"..framework.framework.." ^2Player^7(^3"..src.."^7): '^6"..fund.."^7'", moneyType)
is_success = framework.fundPlayer(src, fund, moneyType)
break
end
@@ -392,41 +392,6 @@ end
--- ```
function ConsumeSuccess(itemName, type, data)
print("^1Deprecated function 'ConsumeSuccess' called, please update your scripts^7")
--local hunger = data and data.hunger or Items[itemName].hunger
--local thirst = data and data.thirst or Items[itemName].thirst
--
--ExecuteCommand("e c")
--removeItem(itemName, 1)
--
--if isStarted(ESXExport) then
-- if hunger then
-- TriggerServerEvent(getScript()..":server:setNeed", "hunger", tonumber(hunger) * 10000)
-- end
-- if thirst then
-- TriggerServerEvent(getScript()..":server:setNeed", "thirst", tonumber(thirst) * 10000)
-- end
--else
-- if hunger then
-- TriggerServerEvent(getScript()..":server:setNeed", "hunger", Core.Functions.GetPlayerData().metadata["hunger"] + tonumber(hunger))
-- end
-- if thirst then
-- TriggerServerEvent(getScript()..":server:setNeed", "thirst", Core.Functions.GetPlayerData().metadata["thirst"] + tonumber(thirst))
-- end
--end
--
--if type == "alcohol" then
-- alcoholCount = (alcoholCount or 0) + 1
-- if alcoholCount > 1 and alcoholCount < 4 then
-- TriggerEvent("evidence:client:SetStatus", "alcohol", 200)
-- elseif alcoholCount >= 4 then
-- TriggerEvent("evidence:client:SetStatus", "heavyalcohol", 200)
-- AlienEffect()
-- end
--end
--
--if Config.Reward then
-- getRandomReward(itemName)
--end
end
-------------------------------------------------------------
@@ -439,19 +404,26 @@ local hasGroupFunc = {
function(group, grade, src)
local hasJobFlag, duty = false, true
local playerInfo = GetPlayer(src)
local jobinfo = playerInfo.job or playerInfo.PlayerData.job
if jobinfo and jobinfo.name == group then
local jobInfo, gangInfo = nil, nil
if next(playerInfo) then
jobInfo = playerInfo.job
gangInfo = playerInfo.gang
if playerInfo.PlayerData then
jobInfo = playerInfo.PlayerData.job
gangInfo = playerInfo.PlayerData.gang
end
end
if jobInfo and jobInfo.name == group then
hasJobFlag = true
duty = jobinfo.onduty
if grade and not (grade <= jobinfo.grade.level) then
duty = jobInfo.onduty
if grade and not (grade <= jobInfo.grade.level) then
hasJobFlag = false
end
return hasJobFlag, duty
end
local ganginfo = playerInfo.gang or playerInfo.PlayerData.gang
if ganginfo and ganginfo.name == group then
if gangInfo and gangInfo.name == group then
hasJobFlag = true
if grade and not (grade <= ganginfo.grade.level) then
if grade and not (grade <= gangInfo.grade.level) then
hasJobFlag = false
end
return hasJobFlag, duty
@@ -465,21 +437,29 @@ local hasGroupFunc = {
function(group, grade, src)
local hasJobFlag, duty = false, true
local playerInfo = GetPlayer(src)
local jobinfo = playerInfo.job or playerInfo.PlayerData.job
if jobinfo and jobinfo.name == group then
local jobInfo, gangInfo = nil, nil
if next(playerInfo) then
jobInfo = playerInfo.job
gangInfo = playerInfo.gang
if playerInfo.PlayerData then
jobInfo = playerInfo.PlayerData.job
gangInfo = playerInfo.PlayerData.gang
end
end
if jobInfo and jobInfo.name == group then
hasJobFlag = true
duty = jobinfo.onduty
if grade and not (grade <= jobinfo.grade.level) then
duty = jobInfo.onduty
if grade and not (grade <= jobInfo.grade.level) then
hasJobFlag = false
end
end
local ganginfo = playerInfo.gang or playerInfo.PlayerData.gang
if ganginfo and ganginfo.name == group then
if gangInfo and gangInfo.name == group then
hasJobFlag = true
if grade and not (grade <= ganginfo.grade.level) then
if grade and not (grade <= gangInfo.grade.level) then
hasJobFlag = false
end
end
::skip::
return hasJobFlag, duty
end,
},
@@ -508,9 +488,8 @@ local hasGroupFunc = {
hasGroup =
function(group, grade, src)
local hasJobFlag, duty = false, true
local playerInfo = GetPlayer(src)
local info = playerInfo.job
local info = playerInfo and playerInfo.job
while not info do
info = GetPlayer(src).job
Wait(100)
@@ -518,7 +497,6 @@ local hasGroupFunc = {
if info.name == group then
hasJobFlag = true
end
return hasJobFlag, duty
end,
},
@@ -528,18 +506,25 @@ local hasGroupFunc = {
function(group, grade, src)
local hasJobFlag, duty = false, true
local playerInfo = GetPlayer(src)
local jobinfo = playerInfo.job or playerInfo.PlayerData.job
if jobinfo and jobinfo.name == group then
local jobInfo, gangInfo = nil, nil
if next(playerInfo) then
jobInfo = playerInfo.job
gangInfo = playerInfo.gang
if playerInfo.PlayerData then
jobInfo = playerInfo.PlayerData.job
gangInfo = playerInfo.PlayerData.gang
end
end
if jobInfo and jobInfo.name == group then
hasJobFlag = true
duty = jobinfo.onduty
if grade and not (grade <= jobinfo.grade.level) then
duty = jobInfo.onduty
if grade and not (grade <= jobInfo.grade.level) then
hasJobFlag = false
end
end
local ganginfo = playerInfo.gang or playerInfo.PlayerData.gang
if ganginfo and ganginfo.name == group then
if gangInfo and gangInfo.name == group then
hasJobFlag = true
if grade and not (grade <= ganginfo.grade.level) then
if grade and not (grade <= gangInfo.grade.level) then
hasJobFlag = false
end
end
@@ -593,6 +578,7 @@ local getPlayerFunc = {
local Player = {}
local info = ESX.GetPlayerFromId(src)
if not info then return {} end
Player = {
name = info.getName(),
cash = info.getMoney(),
@@ -609,8 +595,8 @@ local getPlayerFunc = {
onDuty = info.job.onDuty,
--account = info.charinfo.account,
citizenId = info.identifier,
hunger = info.status.hunger,
thirst = info.status.thirst,
hunger = Player(src).state.hunger or 0,
thirst = Player(src).state.thirst or 0,
}
return Player
end,
@@ -626,6 +612,7 @@ local getPlayerFunc = {
if v.name == "money" then cash = v.money end
if v.name == "bank" then bank = v.money end
end
Player = {
firstname = info.firstName,
lastname = info.lastName,
@@ -642,8 +629,8 @@ local getPlayerFunc = {
citizenId = info.identifier,
isDead = IsEntityDead(PlayerPedId()),
isDown = IsPedDeadOrDying(PlayerPedId(), true),
hunger = info.status.hunger,
thirst = info.status.thirst,
hunger = LocalPlayer.state.hunger or 0,
thirst = LocalPlayer.state.thirst or 0,
}
return Player
end,
@@ -942,6 +929,31 @@ function getPlayer(source)
return Player
end
--- Finds an online player by their citizen ID.
---
--- Iterates all connected players and returns the matching player info table
--- (the same shape as getPlayer()). Returns nil if nobody matches.
--- @param citizenId string The citizen ID to search for.
--- @return table|nil player The matching player info table.
--- @return number|nil src The matching player's server ID.
---
--- @usage
--- ```lua
--- local player, src = getPlayerByCitizenId("ABC12345")
--- if player then print("Found", player.name) end
--- ```
function getPlayerByCitizenId(citizenId)
if not citizenId then return nil, nil end
for _, v in ipairs(GetPlayers()) do
local src = tonumber(v)
local Player = getPlayer(src)
if Player and Player.citizenId == citizenId then
return Player, src
end
end
return nil, nil
end
--- Retrieves all active players within a given radius from the specified coordinates.
---
--- @param coords vector3 The reference coordinates.
+15
View File
@@ -192,6 +192,21 @@ local societyFunc = {
end,
},
{ bankName = "wasabi_banking",
getAccount =
function(society)
return exports['wasabi_banking']:GetAccountBalance(society, 'society')
end,
chargeSociety =
function(society, amount)
exports['wasabi_banking']:RemoveMoney('society', society, amount)
end,
fundSociety =
function(society, amount)
exports['wasabi_banking']:AddMoney('society', society, amount)
end,
},
}
+3
View File
@@ -80,6 +80,9 @@ function searchCar(vehicle)
carInfo.price = 0
carInfo.class = classlist[GetVehicleClass(vehicle) + 1], GetVehicleClass(vehicle)
end
-- without this the function returned nil and anything doing
-- searchCar(vehicle).class would throw
return carInfo
end
else
return carInfo
+3 -1
View File
@@ -33,7 +33,7 @@ Exports = {
}
-- Required variables
debugMode = false
debugMode = true
QBInvNew = true
@@ -181,6 +181,7 @@ for _, v in pairs({ -- This is a specific load order
'make/loaders.lua',
'make/makeBlip.lua',
'make/makePed.lua',
'make/pedTasks.lua',
'make/makeProp.lua',
'make/makeVeh.lua',
'make/cameras.lua',
@@ -188,6 +189,7 @@ for _, v in pairs({ -- This is a specific load order
'wrapperfunctions.lua',
'polyZone.lua',
'clientItemAllowlist.lua',
'itemcontrol.lua',
'playerfunctions.lua',
'metaHandlers.lua',
+11 -7
View File
@@ -1,10 +1,14 @@
2.1.08
2.1.09
- Fix getStash() always trying to use fallback functions
- Start adding stashEditMetadata() function - wip
- Add check for broken/missing config.lua in scripts
- Add fix for debugMode breaking if no config file
- Add a callback to check for society bank balances
- Add player head movement for `lookEnt()` to continue looking after turning
- Add 100 wait for stopCam to reduce slow movement
- Add support for rcore_clothing in openClothing() - Thanks desypher
- Add hunger and thirst calls to getPlayer() - Thanks oosayeroo
- Add support for tgg-billing - Thanks GhostInLowGear
- Fix hasJob() checking players who haven't logged in yet
- Add exploit possibility for removeItem with minus numbers
- Fix movement being allowed when crafting
- Make distExploitCheck() more verbose
- CodeM slot fix, force to number (because numbers are apparently strings)
- ESX change to check statebag for hunger and thirst info
https://github.com/jimathy/jim_bridge/releases/latest