mirror of
https://github.com/jimathy/jim_bridge.git
synced 2026-08-18 14:26:03 +01:00
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
268c95f29a | ||
|
|
91dd069e5a | ||
|
|
f96d96f26e |
@@ -1,6 +1,6 @@
|
|||||||
name "Jim_Bridge"
|
name "Jim_Bridge"
|
||||||
author "Jimathy"
|
author "Jimathy"
|
||||||
version "2.1.0"
|
version "2.1.01"
|
||||||
description "Framework Bridge By Jimathy"
|
description "Framework Bridge By Jimathy"
|
||||||
fx_version "cerulean"
|
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.'
|
rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.'
|
||||||
|
|||||||
@@ -2104,9 +2104,7 @@ end
|
|||||||
function openStash(data)
|
function openStash(data)
|
||||||
if (data.job or data.gang) and not jobCheck(data.job or data.gang) then return end
|
if (data.job or data.gang) and not jobCheck(data.job or data.gang) then return end
|
||||||
|
|
||||||
local p = promise.new()
|
local exploitCheck = triggerCallback(getScript()..":getRegisteredStashLocations", data.stash)
|
||||||
p:resolve(triggerCallback(getScript()..":getRegisteredStashLocations", data.stash))
|
|
||||||
local exploitCheck = Citizen.Await(p)
|
|
||||||
|
|
||||||
if not exploitCheck then
|
if not exploitCheck then
|
||||||
print("^3Warning^7: ^2This isn't a registered stash^1, refusing call^7")
|
print("^3Warning^7: ^2This isn't a registered stash^1, refusing call^7")
|
||||||
@@ -2351,19 +2349,23 @@ end
|
|||||||
--- )
|
--- )
|
||||||
--- ```
|
--- ```
|
||||||
function registerStash(name, label, slots, weight, owner, coords)
|
function registerStash(name, label, slots, weight, owner, coords)
|
||||||
if coords then
|
|
||||||
|
-- ensure tables exist
|
||||||
|
stashExploitCheck = stashExploitCheck or {}
|
||||||
stashExploitCheck[name] = stashExploitCheck[name] or {}
|
stashExploitCheck[name] = stashExploitCheck[name] or {}
|
||||||
stashExploitCheck[name][#stashExploitCheck[name]+1] = coords
|
|
||||||
else
|
|
||||||
print("^3Warning^7: ^1Stash ^4"..name.." ^1doesn^7'^1t have coords^7, ^1this is exploitable^7, ^1add coords to ^3regiterStash^7()")
|
|
||||||
end
|
|
||||||
for i = 1, #InvFunc do
|
for i = 1, #InvFunc do
|
||||||
local inv = InvFunc[i]
|
local inv = InvFunc[i]
|
||||||
if isStarted(inv.invName) then
|
if isStarted(inv.invName) then
|
||||||
inv.registerStash(name, label, slots, weight, owner, coords)
|
inv.registerStash(name, label, slots, weight, owner, coords)
|
||||||
return
|
break
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if coords then
|
||||||
|
stashExploitCheck[name][#stashExploitCheck[name]+1] = coords.xyz
|
||||||
|
else
|
||||||
|
print("^3Warning^7: ^1Stash ^4"..name.." ^1doesn^7'^1t have coords^7, ^1this is exploitable^7, ^1add coords to ^3regiterStash^7()")
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
if isServer() then
|
if isServer() then
|
||||||
@@ -2689,6 +2691,9 @@ end)
|
|||||||
--- ```
|
--- ```
|
||||||
function registerShop(name, label, items, society, coords)
|
function registerShop(name, label, items, society, coords)
|
||||||
local shopResource = ""
|
local shopResource = ""
|
||||||
|
-- ensure tables exist
|
||||||
|
shopExploitCheck = shopExploitCheck or {}
|
||||||
|
shopExploitCheck[name] = shopExploitCheck[name] or {}
|
||||||
|
|
||||||
for i = 1, #InvFunc do
|
for i = 1, #InvFunc do
|
||||||
local inv = InvFunc[i]
|
local inv = InvFunc[i]
|
||||||
@@ -2700,9 +2705,7 @@ function registerShop(name, label, items, society, coords)
|
|||||||
end
|
end
|
||||||
|
|
||||||
-- If received coords, pass them to distance check cache
|
-- If received coords, pass them to distance check cache
|
||||||
if coords and type(coords) == "vector3" then
|
if coords then
|
||||||
--print("Registered Shop Correctly")
|
|
||||||
shopExploitCheck[name] = shopExploitCheck[name] or {}
|
|
||||||
shopExploitCheck[name][#shopExploitCheck[name]+1] = coords
|
shopExploitCheck[name][#shopExploitCheck[name]+1] = coords
|
||||||
else
|
else
|
||||||
print("^3Warning^7: ^1Store ^4"..name.." ^1doesn^7'^1t have coords^7, ^1this is exploitable^7, ^1add coords to ^3regiterShop^7()")
|
print("^3Warning^7: ^1Store ^4"..name.." ^1doesn^7'^1t have coords^7, ^1this is exploitable^7, ^1add coords to ^3regiterShop^7()")
|
||||||
|
|||||||
@@ -920,17 +920,10 @@ local wardrobeFunc = {
|
|||||||
end)
|
end)
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
{ name = "illenium-appearance",
|
{
|
||||||
|
name = "illenium-appearance",
|
||||||
openWardrobe = function()
|
openWardrobe = function()
|
||||||
exports['illenium-appearance']:startPlayerCustomization(function(appearance)
|
TriggerEvent("illenium-appearance:client:openOutfitMenu")
|
||||||
if appearance then
|
|
||||||
TriggerServerEvent("illenium-appearance:server:saveAppearance", appearance)
|
|
||||||
end
|
|
||||||
end, {
|
|
||||||
components = true, componentConfig = { masks = true, upperBody = true, lowerBody = true, bags = true, shoes = true, scarfAndChains = true, bodyArmor = true, shirts = true, decals = true, jackets = true },
|
|
||||||
props = true, propConfig = { hats = true, glasses = true, ear = true, watches = true, bracelets = true },
|
|
||||||
enableExit = true,
|
|
||||||
})
|
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
2.1.0
|
2.1.01
|
||||||
|
|
||||||
- Script Overhaul, replace whole script
|
- Script Overhaul, replace whole script
|
||||||
- Very alpha support for VorpCore
|
- Very alpha support for VorpCore
|
||||||
@@ -12,5 +12,6 @@
|
|||||||
- Optimize and Enhance built-in progressbar + target functions
|
- Optimize and Enhance built-in progressbar + target functions
|
||||||
- Improve weird multicharacter issue triggering onPlayerLoaded more than once
|
- Improve weird multicharacter issue triggering onPlayerLoaded more than once
|
||||||
- Scripts that use this will need updating too, as things like stashes won't open
|
- Scripts that use this will need updating too, as things like stashes won't open
|
||||||
|
- **Hotfix for stores and stashes not registering properly**
|
||||||
|
|
||||||
https://github.com/jimathy/jim_bridge/releases/latest
|
https://github.com/jimathy/jim_bridge/releases/latest
|
||||||
Reference in New Issue
Block a user