FumeNodes/jim_bridge
1
0
Fork 0
mirror of https://github.com/jimathy/jim_bridge.git synced 2026-08-18 22:36:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix jpr erroring when clearStash is triggered

Browse Source
This commit is contained in:
Jim Shield
2025-06-20 20:56:45 +01:00
parent de45491c8c
commit 387c97de71
1 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
shared/stashcontrol.lua
View File

@@ -243,18 +243,14 @@ end)
function clearStash(stashId) function clearStash(stashId)
if isStarted(JPRInv) then if isStarted(JPRInv) then
debugPrint("^5Bridge^7: ^2Cleared ^3"..JPRInv.."^2 Stash^7", stashId) debugPrint("^5Bridge^7: ^2Clearing ^3"..JPRInv.."^2 Stash^7", stashId)
if QBInvNew then MySQL.Async.insert('INSERT INTO stashitems (stash, items) VALUES (:stash, :items) ON DUPLICATE KEY UPDATE items = :items', {
exports[JPRInv]:ClearStash(stashId) ['stash'] = stashId,
else ['items'] = json.encode({})
MySQL.Async.insert('INSERT INTO stashitems (stash, items) VALUES (:stash, :items) ON DUPLICATE KEY UPDATE items = :items', { })
['stash'] = stashId,
['items'] = json.encode({})
})
end
elseif isStarted(QBInv) then elseif isStarted(QBInv) then
debugPrint("^5Bridge^7: ^2Cleared ^3"..QBInv.."^2 Stash^7", stashId) debugPrint("^5Bridge^7: ^2Clearing ^3"..QBInv.."^2 Stash^7", stashId)
if QBInvNew then if QBInvNew then
exports[QBInv]:ClearStash(stashId) exports[QBInv]:ClearStash(stashId)
else else
@@ -265,11 +261,11 @@ function clearStash(stashId)
end end
elseif isStarted(OXInv) then elseif isStarted(OXInv) then
debugPrint("^5Bridge^7: ^2Cleared ^3"..OXInv.."^2 Stash^7", stashId) debugPrint("^5Bridge^7: ^2Clearing ^3"..OXInv.."^2 Stash^7", stashId)
exports[OXInv]:ClearInventory(stashId) exports[OXInv]:ClearInventory(stashId)
elseif isStarted(PSInv) then elseif isStarted(PSInv) then
debugPrint("^5Bridge^7: ^2Cleared ^3"..PSInv.."^2 Stash^7", stashId) debugPrint("^5Bridge^7: ^2Clearing ^3"..PSInv.."^2 Stash^7", stashId)
if QBInvNew then if QBInvNew then
exports[PSInv]:ClearStash(stashId) exports[PSInv]:ClearStash(stashId)
else else
@@ -279,29 +275,28 @@ function clearStash(stashId)
}) })
end end
elseif isStarted(QSInv) then elseif isStarted(QSInv) then
debugPrint("^5Bridge^7: ^2Cleared ^3"..QSInv.."^2 Stash^7", stashId) debugPrint("^5Bridge^7: ^2Clearing ^3"..QSInv.."^2 Stash^7", stashId)
exports[QSInv]:ClearOtherInventory('stash', stashId) exports[QSInv]:ClearOtherInventory('stash', stashId)
elseif isStarted(CoreInv) then elseif isStarted(CoreInv) then
debugPrint("^5Bridge^7: ^2Cleared ^3"..CoreInv.."^2 Stash^7", stashId) debugPrint("^5Bridge^7: ^2Clearing ^3"..CoreInv.."^2 Stash^7", stashId)
exports[CoreInv]:clearInventory("stash-"..stashId) exports[CoreInv]:clearInventory("stash-"..stashId)
elseif isStarted(CodeMInv) then elseif isStarted(CodeMInv) then
debugPrint("^5Bridge^7: ^2Cleared ^3"..CodeMInv.."^2 Stash^7", stashId) debugPrint("^5Bridge^7: ^2Clearing ^3"..CodeMInv.."^2 Stash^7", stashId)
exports[CodeMInv]:ClearInventory(stashId) exports[CodeMInv]:ClearInventory(stashId)
elseif isStarted(OrigenInv) then elseif isStarted(OrigenInv) then
debugPrint("^5Bridge^7: ^2Cleared ^3"..OrigenInv.."^2 Stash^7", stashId) debugPrint("^5Bridge^7: ^2Clearing ^3"..OrigenInv.."^2 Stash^7", stashId)
exports[OrigenInv]:ClearInventory(stashId) exports[OrigenInv]:ClearInventory(stashId)
elseif isStarted(TgiannInv) then elseif isStarted(TgiannInv) then
debugPrint("^5Bridge^7: ^2Cleared ^3"..TgiannInv.."^2 Stash^7", stashId) debugPrint("^5Bridge^7: ^2Clearing ^3"..TgiannInv.."^2 Stash^7", stashId)
exports["tgiann-inventory"]:DeleteInventory("stash", stashId) exports["tgiann-inventory"]:DeleteInventory("stash", stashId)
elseif isStarted(RSGInv) then elseif isStarted(RSGInv) then
debugPrint("^5Bridge^7: ^2Cleared ^3"..RSGInv.."^2 Stash^7", stashId) debugPrint("^5Bridge^7: ^2Clearing ^3"..RSGInv.."^2 Stash^7", stashId)
exports[RSGInv]:ClearStash(stashId) exports[RSGInv]:ClearStash(stashId)
end end
@@ -661,7 +656,7 @@ function registerStash(name, label, slots, weight, owner, coords)
if stashResource ~= "" then if stashResource ~= "" then
debugPrint("^6Bridge^7: ^2Registering ^4"..stashResource.." ^3Stash^7:", name, "^4Label^7: "..label) debugPrint("^6Bridge^7: ^2Registering ^4"..stashResource.." ^3Stash^7:", name, "^4Label^7: "..label)
else else
print("^1ERROR^7: ^1Couldn't find supported inventory to register stash^7:", name) debugPrint("^1ERROR^7: ^1Couldn't find supported inventory to register stash^7:", name)
end end
end end