mtcontrib/3d_armor
1
0
Fork 2
mirror of https://github.com/minetest-mods/3d_armor.git synced 2025-06-29 06:40:41 +02:00
Code Issues Releases Wiki Activity

Reverse order of stack and index in callbacks for consistency

Browse Source
This commit is contained in:
stujones11
2017-04-15 20:37:32 +01:00
parent a2ec13e28d
commit 99bc8cf2d3
4 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
3d_armor/api.lua
View File

@ -140,17 +140,17 @@ armor.register_on_destroy = function(self, func)
end
end
armor.run_callbacks = function(self, callback, player, stack, index)
armor.run_callbacks = function(self, callback, player, index, stack)
if stack then
local def = stack:get_definition() or {}
if type(def[callback]) == "function" then
def[callback](player, stack, index)
def[callback](player, index, stack)
end
end
local callbacks = self.registered_callbacks[callback]
if callbacks then
for _, func in pairs(callbacks) do
func(player, stack, index)
func(player, index, stack)
end
end
end
@ -180,12 +180,12 @@ armor.init_player_armor = function(self, player)
on_put = function(inv, listname, index, stack, player)
player:get_inventory():set_stack(listname, index, stack)
armor:set_player_armor(player)
armor:run_callbacks("on_equip", player, stack, index)
armor:run_callbacks("on_equip", player, index, stack)
end,
on_take = function(inv, listname, index, stack, player)
player:get_inventory():set_stack(listname, index, nil)
armor:set_player_armor(player)
armor:run_callbacks("on_unequip", player, stack, index)
armor:run_callbacks("on_unequip", player, index, stack)
end,
on_move = function(inv, from_list, from_index, to_list, to_index, count, player)
local plaver_inv = player:get_inventory()
@ -222,7 +222,7 @@ armor.init_player_armor = function(self, player)
for i=1, 6 do
local stack = player_inv:get_stack("armor", i)
armor_inv:set_stack("armor", i, stack)
self:run_callbacks("on_equip", player, stack, i)
self:run_callbacks("on_equip", player, i, stack)
end
self.def[name] = {
init_time = minetest.get_gametime(),
@ -448,10 +448,10 @@ armor.punch = function(self, player, hitter, time_from_last_punch, tool_capabili
local old_stack = ItemStack(stack)
stack:add_wear(use)
self:set_inventory_stack(player, i, stack)
self:run_callbacks("on_damage", player, stack, i)
self:run_callbacks("on_damage", player, i, stack)
if stack:get_count() == 0 then
self:run_callbacks("on_unequip", player, old_stack, i)
self:run_callbacks("on_destroy", player, old_stack, i)
self:run_callbacks("on_unequip", player, i, old_stack)
self:run_callbacks("on_destroy", player, i, old_stack)
self:set_player_armor(player)
end
end