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

fix: getstorage talkaction #3240

Merged
merged 2 commits into from
Jan 11, 2025
Merged

fix: getstorage talkaction #3240

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa0a0a0
Update manage_storage.lua
kaleohanopahala Jan 10, 2025
b534b21
Lua code format - (Stylua)
github-actions[bot] Jan 10, 2025
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
30 changes: 15 additions & 15 deletions data/scripts/talkactions/god/manage_storage.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,30 @@ function Player.getStorageValueTalkaction(self, param)
end

local split = param:split(",")
if split[2] == nil then
player:sendCancelMessage("Insufficient parameters.")
if not split[2] then
self:sendCancelMessage("Insufficient parameters.")
return true
end

local target = Player(split[1])
if target == nil then
local target = Player(split[1]:trim())
if not target then
self:sendCancelMessage("A player with that name is not online.")
return true
end

split[2] = split[2]:trimSpace()
-- Storage key Validation
local storageKey = tonumber(split[2]) or split[2]:trim()
if not storageKey then
self:sendCancelMessage("Invalid storage key or name.")
return true
end

-- Try to convert the second parameter to a number. If it's not a number, treat it as a storage name
local storageKey = tonumber(split[2])
if storageKey == nil then
-- Get the key for this storage name
local storageName = tostring(split[2])
local storageValue = target:getStorageValueByName(storageName)
self:sendTextMessage(MESSAGE_EVENT_ADVANCE, "The storage with id: " .. storageName .. " from player " .. split[1] .. " is: " .. storageValue .. ".")
-- Get the storage key
local storageValue = target:getStorageValue(storageKey)
if storageValue == nil then
self:sendTextMessage(MESSAGE_EVENT_ADVANCE, "The storage with id: " .. split[2] .. " does not exist or is not set for player " .. target:getName() .. ".")
else
local storageValue = target:getStorageValue(storageKey)
self:sendTextMessage(MESSAGE_EVENT_ADVANCE, "The storage with id: " .. storageKey .. " from player " .. split[1] .. " is: " .. storageValue .. ".")
self:sendTextMessage(MESSAGE_EVENT_ADVANCE, "The storage with id: " .. split[2] .. " from player " .. target:getName() .. " is: " .. storageValue .. ".")
end

return true
Expand All @@ -44,7 +45,6 @@ end
storageGet:separator(" ")
storageGet:groupType("gamemaster")
storageGet:register()

---------------- // ----------------
function Player.setStorageValueTalkaction(self, param)
-- Sanity check for parameters
Expand Down
Loading