Mirrorlandia_minetest/3d_armor
1
0
Fork 0
mirror of https://github.com/minetest-mods/3d_armor.git synced 2024-11-22 20:43:43 +01:00
Code Issues Projects Releases Wiki Activity

fix callbacks not being called by armor.equip() and armor.unequip() (#59)

Browse Source
This commit is contained in:
OgelGames 2021-07-31 00:02:59 +10:00 committed by GitHub
parent ac7615212b
commit a897f7e72f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
3d_armor/api.lua
View File

@ -487,13 +487,22 @@ end
armor.equip = function(self, player, itemstack) 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 weared_armor = self:get_weared_armor_elements(player)
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
if weared_armor[armor_element] ~= nil then local index
for i=1, armor_inv:get_size("armor") do
local stack = armor_inv:get_stack("armor", i)
if self:get_element(stack:get_name()) == armor_element then
index = i
self:unequip(player, armor_element) self:unequip(player, armor_element)
break
elseif not index and stack:is_empty() then
index = i
end end
armor_inv:add_item("armor", itemstack:take_item()) end
local stack = itemstack:take_item()
armor_inv:set_stack("armor", index, stack)
self:run_callbacks("on_equip", player, index, stack)
self:set_player_armor(player) self:set_player_armor(player)
self:save_armor_inventory(player) self:save_armor_inventory(player)
end end
@ -502,21 +511,27 @@ end
armor.unequip = function(self, player, armor_element) armor.unequip = function(self, player, armor_element)
local name, armor_inv = self:get_valid_player(player, "[unequip]") local name, armor_inv = self:get_valid_player(player, "[unequip]")
local weared_armor = self:get_weared_armor_elements(player) if not name then
if not name or not weared_armor[armor_element] then
return return
end end
local itemstack = armor_inv:remove_item("armor", ItemStack(weared_armor[armor_element])) for i=1, armor_inv:get_size("armor") do
local stack = armor_inv:get_stack("armor", i)
if self:get_element(stack:get_name()) == armor_element then
armor_inv:set_stack("armor", i, "")
minetest.after(0, function() minetest.after(0, function()
local inv = player:get_inventory() local inv = player:get_inventory()
if inv:room_for_item("main", itemstack) then if inv:room_for_item("main", stack) then
inv:add_item("main", itemstack) inv:add_item("main", stack)
else else
minetest.add_item(player:get_pos(), itemstack) minetest.add_item(player:get_pos(), stack)
end end
end) end)
self:run_callbacks("on_unequip", player, i, stack)
self:set_player_armor(player) self:set_player_armor(player)
self:save_armor_inventory(player) self:save_armor_inventory(player)
return
end
end
end end
armor.remove_all = function(self, player) armor.remove_all = function(self, player)