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.

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 #3199

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
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
11 changes: 5 additions & 6 deletions data/scripts/talkactions/god/manage_storage.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
if not HasValidTalkActionParams(self, param, "Usage: /getstorage <playername>, <storage key or name>") then
return true
end

Check warning on line 8 in data/scripts/talkactions/god/manage_storage.lua

View workflow job for this annotation

GitHub Actions / luacheck

[luacheck] reported by reviewdog 🐶 line contains only whitespace Raw Output: data/scripts/talkactions/god/manage_storage.lua:8:1: line contains only whitespace
local split = param:split(",")
if split[2] == nil then
player:sendCancelMessage("Insufficient parameters.")
Expand All @@ -18,15 +18,14 @@
return true
end

split[2] = split[2]:trimSpace()

storageStringToVar = loadstring("return " .. split[2])()

Check warning on line 22 in data/scripts/talkactions/god/manage_storage.lua

View workflow job for this annotation

GitHub Actions / luacheck

[luacheck] reported by reviewdog 🐶 line contains only whitespace Raw Output: data/scripts/talkactions/god/manage_storage.lua:22:1: line contains only whitespace
-- 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 .. ".")
local storageValue = target:getStorageValue(storageStringToVar)
self:sendTextMessage(MESSAGE_EVENT_ADVANCE, "The storage with id: " .. split[2] .. " from player " .. split[1] .. " is: " .. storageValue .. ".")
else
local storageValue = target:getStorageValue(storageKey)
self:sendTextMessage(MESSAGE_EVENT_ADVANCE, "The storage with id: " .. storageKey .. " from player " .. split[1] .. " is: " .. storageValue .. ".")
Expand Down
Loading