Skip to content

fix: possible nill configureLootAttributes function #3756

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: possible nill configureLootAttributes function #3756

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90c1edc
Fix possible nill configureLootAttributes function
kaleohanopahala Oct 31, 2025
ddb2d3d
Lua code format - (Stylua)
github-actions[bot] Oct 31, 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
39 changes: 32 additions & 7 deletions data/scripts/lib/register_monster_type.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,8 @@ local function configureLootAttributes(lootObject, lootProperties)
if lootProperties.subType or lootProperties.charges then
lootObject:setSubType(lootProperties.subType or lootProperties.charges)
else
local itemType = ItemType(lootProperties.name or lootProperties.itemId)
local itemTypeLookup = lootProperties.name or lootProperties.itemId or lootProperties.id
local itemType = itemTypeLookup and ItemType(itemTypeLookup)
if itemType and itemType:getCharges() > 1 then
lootObject:setSubType(itemType:getCharges())
end
Expand All @@ -368,15 +369,39 @@ local function configureLootAttributes(lootObject, lootProperties)
if lootProperties.maxCount ~= nil then
lootObject:setMaxCount(lootProperties.maxCount)
end
lootObject:setActionId(lootProperties.aid or lootProperties.actionId or 0)
local explicitActionId = lootProperties.aid
if explicitActionId == nil then
explicitActionId = lootProperties.actionId
end
if explicitActionId ~= nil then
lootObject:setActionId(explicitActionId)
end
lootObject:setText(lootProperties.text or lootProperties.description or "")
lootObject:setNameItem(lootProperties.name or "")
lootObject:setArticle(lootProperties.article or "")
lootObject:setAttack(lootProperties.attack or 0)
lootObject:setDefense(lootProperties.defense or 0)
lootObject:setExtraDefense(lootProperties.extraDefense or lootProperties.extraDef or 0)
lootObject:setArmor(lootProperties.armor or 0)
lootObject:setShootRange(lootProperties.shootRange or lootProperties.range or 0)
if lootProperties.attack ~= nil then
lootObject:setAttack(lootProperties.attack)
end
if lootProperties.defense ~= nil then
lootObject:setDefense(lootProperties.defense)
end
local extraDefense = lootProperties.extraDefense
if extraDefense == nil then
extraDefense = lootProperties.extraDef
end
if extraDefense ~= nil then
lootObject:setExtraDefense(extraDefense)
end
if lootProperties.armor ~= nil then
lootObject:setArmor(lootProperties.armor)
end
local shootRange = lootProperties.shootRange
if shootRange == nil then
shootRange = lootProperties.range
end
if shootRange ~= nil then
lootObject:setShootRange(shootRange)
end
lootObject:setUnique(lootProperties.unique or false)
end

Expand Down