forked from Simnation/Main
Update server.lua
This commit is contained in:
parent
d21fa8d470
commit
ff10efa7d1
1 changed files with 22 additions and 84 deletions
|
@ -7,26 +7,13 @@ RegisterNetEvent('shredder:server:openInventory', function(shredderID)
|
||||||
|
|
||||||
if not Player then return end
|
if not Player then return end
|
||||||
|
|
||||||
-- Check if the export exists and is working
|
-- Use the correct export for opening inventory
|
||||||
if not exports['tgiann-inventory'] then
|
-- According to docs: OpenInventory(src, invType, invId, invData, openType)
|
||||||
print("^1[SHREDDER ERROR]^7 tgiann-inventory export not found!")
|
exports["tgiann-inventory"]:OpenInventory(src, "stash", shredderID, {
|
||||||
TriggerClientEvent('QBCore:Notify', src, 'System Error: Inventory system not available', 'error')
|
maxweight = 50000, -- 50kg max
|
||||||
return
|
slots = 20, -- 20 Slots
|
||||||
end
|
label = 'Müllschredder'
|
||||||
|
})
|
||||||
-- Try to open inventory with error handling
|
|
||||||
local success, err = pcall(function()
|
|
||||||
exports['tgiann-inventory']:OpenInventory(src, 'stash', shredderID, {
|
|
||||||
maxweight = 50000, -- 50kg max
|
|
||||||
slots = 20, -- 20 Slots
|
|
||||||
label = 'Müllschredder'
|
|
||||||
})
|
|
||||||
end)
|
|
||||||
|
|
||||||
if not success then
|
|
||||||
print("^1[SHREDDER ERROR]^7 Failed to open inventory: " .. tostring(err))
|
|
||||||
TriggerClientEvent('QBCore:Notify', src, 'Failed to open inventory', 'error')
|
|
||||||
end
|
|
||||||
end)
|
end)
|
||||||
|
|
||||||
-- Items aus Schredder abrufen
|
-- Items aus Schredder abrufen
|
||||||
|
@ -36,28 +23,12 @@ RegisterNetEvent('shredder:server:getItems', function(shredderID)
|
||||||
|
|
||||||
if not Player then return end
|
if not Player then return end
|
||||||
|
|
||||||
-- Check if the export exists
|
-- Use the correct export for getting secondary inventory items
|
||||||
if not exports['tgiann-inventory'] then
|
-- According to docs: GetSecondaryInventoryItems(invType, invName)
|
||||||
print("^1[SHREDDER ERROR]^7 tgiann-inventory export not found!")
|
local items = exports["tgiann-inventory"]:GetSecondaryInventoryItems("stash", shredderID)
|
||||||
TriggerClientEvent('QBCore:Notify', src, 'System Error: Inventory system not available', 'error')
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Try to get inventory with error handling
|
-- If items is nil, provide an empty table
|
||||||
local items = {}
|
if items == nil then items = {} end
|
||||||
local success, err = pcall(function()
|
|
||||||
items = exports['tgiann-inventory']:GetInventory(shredderID) or {}
|
|
||||||
end)
|
|
||||||
|
|
||||||
if not success then
|
|
||||||
print("^1[SHREDDER ERROR]^7 Failed to get inventory: " .. tostring(err))
|
|
||||||
items = {}
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Check if items is nil and provide a default empty table
|
|
||||||
if items == nil then
|
|
||||||
items = {}
|
|
||||||
end
|
|
||||||
|
|
||||||
TriggerClientEvent('shredder:client:showMenu', src, items, shredderID)
|
TriggerClientEvent('shredder:client:showMenu', src, items, shredderID)
|
||||||
end)
|
end)
|
||||||
|
@ -69,25 +40,11 @@ RegisterNetEvent('shredder:server:destroySingle', function(itemName, amount, slo
|
||||||
|
|
||||||
if not Player then return end
|
if not Player then return end
|
||||||
|
|
||||||
-- Check if the export exists
|
-- Use the correct export for removing item from secondary inventory
|
||||||
if not exports['tgiann-inventory'] then
|
-- According to docs: RemoveItemFromSecondaryInventory(invType, invName, item, amount, slot, metadata)
|
||||||
print("^1[SHREDDER ERROR]^7 tgiann-inventory export not found!")
|
local success = exports["tgiann-inventory"]:RemoveItemFromSecondaryInventory("stash", shredderID, itemName, amount, slot)
|
||||||
TriggerClientEvent('QBCore:Notify', src, 'System Error: Inventory system not available', 'error')
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Try to remove item with error handling
|
if success then
|
||||||
local success, result = pcall(function()
|
|
||||||
return exports['tgiann-inventory']:RemoveItemFromInventory(shredderID, itemName, amount, slot)
|
|
||||||
end)
|
|
||||||
|
|
||||||
if not success then
|
|
||||||
print("^1[SHREDDER ERROR]^7 Failed to remove item: " .. tostring(result))
|
|
||||||
TriggerClientEvent('QBCore:Notify', src, 'Failed to remove item', 'error')
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
if result then
|
|
||||||
-- Log für Admins
|
-- Log für Admins
|
||||||
print('^3[SHREDDER]^7 ' .. GetPlayerName(src) .. ' (' .. Player.PlayerData.citizenid .. ') hat ' .. amount .. 'x ' .. itemName .. ' vernichtet')
|
print('^3[SHREDDER]^7 ' .. GetPlayerName(src) .. ' (' .. Player.PlayerData.citizenid .. ') hat ' .. amount .. 'x ' .. itemName .. ' vernichtet')
|
||||||
|
|
||||||
|
@ -99,7 +56,7 @@ RegisterNetEvent('shredder:server:destroySingle', function(itemName, amount, slo
|
||||||
|
|
||||||
-- Menü neu laden
|
-- Menü neu laden
|
||||||
Wait(1000)
|
Wait(1000)
|
||||||
TriggerEvent('shredder:server:getItems', src, shredderID)
|
TriggerServerEvent('shredder:server:getItems', shredderID)
|
||||||
else
|
else
|
||||||
TriggerClientEvent('QBCore:Notify', src, 'Fehler beim Vernichten des Items!', 'error')
|
TriggerClientEvent('QBCore:Notify', src, 'Fehler beim Vernichten des Items!', 'error')
|
||||||
end
|
end
|
||||||
|
@ -112,26 +69,9 @@ RegisterNetEvent('shredder:server:destroyAll', function(shredderID)
|
||||||
|
|
||||||
if not Player then return end
|
if not Player then return end
|
||||||
|
|
||||||
-- Check if the export exists
|
-- Use the correct export for getting secondary inventory items
|
||||||
if not exports['tgiann-inventory'] then
|
local items = exports["tgiann-inventory"]:GetSecondaryInventoryItems("stash", shredderID)
|
||||||
print("^1[SHREDDER ERROR]^7 tgiann-inventory export not found!")
|
|
||||||
TriggerClientEvent('QBCore:Notify', src, 'System Error: Inventory system not available', 'error')
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Try to get inventory with error handling
|
|
||||||
local items = {}
|
|
||||||
local success, err = pcall(function()
|
|
||||||
items = exports['tgiann-inventory']:GetInventory(shredderID) or {}
|
|
||||||
end)
|
|
||||||
|
|
||||||
if not success then
|
|
||||||
print("^1[SHREDDER ERROR]^7 Failed to get inventory: " .. tostring(err))
|
|
||||||
TriggerClientEvent('QBCore:Notify', src, 'Failed to get inventory', 'error')
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Check if items is nil or empty
|
|
||||||
if not items or next(items) == nil then
|
if not items or next(items) == nil then
|
||||||
TriggerClientEvent('QBCore:Notify', src, 'Der Schredder ist bereits leer!', 'error')
|
TriggerClientEvent('QBCore:Notify', src, 'Der Schredder ist bereits leer!', 'error')
|
||||||
return
|
return
|
||||||
|
@ -143,11 +83,9 @@ RegisterNetEvent('shredder:server:destroyAll', function(shredderID)
|
||||||
-- Alle Items vernichten
|
-- Alle Items vernichten
|
||||||
for slot, item in pairs(items) do
|
for slot, item in pairs(items) do
|
||||||
if item and item.amount and item.amount > 0 then
|
if item and item.amount and item.amount > 0 then
|
||||||
local removeSuccess, removeResult = pcall(function()
|
-- Use the correct export for removing item from secondary inventory
|
||||||
return exports['tgiann-inventory']:RemoveItemFromInventory(shredderID, item.name, item.amount, slot)
|
local success = exports["tgiann-inventory"]:RemoveItemFromSecondaryInventory("stash", shredderID, item.name, item.amount, slot)
|
||||||
end)
|
if success then
|
||||||
|
|
||||||
if removeSuccess and removeResult then
|
|
||||||
table.insert(destroyedItems, {name = item.name, amount = item.amount})
|
table.insert(destroyedItems, {name = item.name, amount = item.amount})
|
||||||
totalItems = totalItems + item.amount
|
totalItems = totalItems + item.amount
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue