mtcontrib/3d_armor
1
0
Fork 2
mirror of https://github.com/minetest-mods/3d_armor.git synced 2025-11-09 08:35:24 +01:00
Code Issues Releases Wiki Activity

Return swapped item in armor.equip() instead of calling armor.unequip() (#166)

Browse Source 
This also eliminates a lot of unnecessary function calls.
This commit is contained in:
OgelGames
2025-11-08 19:06:08 +11:00
committed by GitHub
parent 8f775a64f0
commit 0321907bf5
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
3d_armor/api.lua
View File

@@ -679,16 +679,16 @@ armor.equip = function(self, player, itemstack)
local name, armor_inv = self:get_valid_player(player, "[equip]") local name, armor_inv = self:get_valid_player(player, "[equip]")
local armor_element = self:get_element(itemstack:get_name()) local armor_element = self:get_element(itemstack:get_name())
if name and armor_element then if name and armor_element then
local index local index, old_stack
for i=1, armor_inv:get_size("armor") do for i, stack in ipairs(armor_inv:get_list("armor")) do
local stack = armor_inv:get_stack("armor", i)
if self:get_element(stack:get_name()) == armor_element then if self:get_element(stack:get_name()) == armor_element then
--prevents equiping an armor that would unequip a cursed armor. -- prevents equiping an armor that would unequip a cursed armor.
if minetest.get_item_group(stack:get_name(), "cursed") ~= 0 then if minetest.get_item_group(stack:get_name(), "cursed") ~= 0 then
return itemstack return itemstack
end end
index = i index = i
self:unequip(player, armor_element) old_stack = stack
self:run_callbacks("on_unequip", player, i, stack)
break break
elseif not index and stack:is_empty() then elseif not index and stack:is_empty() then
index = i index = i
@@ -697,11 +697,13 @@ armor.equip = function(self, player, itemstack)
if not index then -- armor inventory is full with other armor elements if not index then -- armor inventory is full with other armor elements
return itemstack return itemstack
end end
local stack = itemstack:take_item() -- Swap the stack at 'index' with 'itemstack'
armor_inv:set_stack("armor", index, stack) armor_inv:set_stack("armor", index, itemstack)
self:run_callbacks("on_equip", player, index, stack) self:run_callbacks("on_equip", player, index, itemstack)
self:set_player_armor(player) self:set_player_armor(player)
self:save_armor_inventory(player) self:save_armor_inventory(player)
-- Remainder: the previous slot content
return old_stack or ItemStack()
end end
return itemstack return itemstack
end end