diff --git a/3d_armor/README.txt b/3d_armor/README.txt index 8f67c4f..866c2c5 100644 --- a/3d_armor/README.txt +++ b/3d_armor/README.txt @@ -90,7 +90,7 @@ Additional fields supported by 3d_armor: on_unequip = on_destroy = on_damage = - on_punch = + on_punched = armor:register_armor_group(group, base) @@ -163,11 +163,11 @@ on_equip = func(player, index, stack) on_unequip = func(player, index, stack) on_destroy = func(player, index, stack) on_damage = func(player, index, stack) -on_punch = func(player, hitter, time_from_last_punch, tool_capabilities) +on_punched = func(player, hitter, time_from_last_punch, tool_capabilities) Notes: -`on_punch` is called every time a player is punched or takes damage, `hitter`, +`on_punched` is called every time a player is punched or takes damage, `hitter`, `time_from_last_punch` and `tool_capabilities` can be `nil` and will be in the case of fall damage, etc. When fire protection is enabled, hitter == "fire" in the event of fire damage. Return `false` to override armor damage effects. diff --git a/3d_armor/api.lua b/3d_armor/api.lua index c492e8a..bd438a7 100644 --- a/3d_armor/api.lua +++ b/3d_armor/api.lua @@ -305,8 +305,8 @@ armor.punch = function(self, player, hitter, time_from_last_punch, tool_capabili local use = minetest.get_item_group(name, "armor_use") or 0 local damage = use > 0 local def = stack:get_definition() or {} - if type(def.on_punch) == "function" then - damage = def.on_punch(player, hitter, time_from_last_punch, + if type(def.on_punched) == "function" then + damage = def.on_punched(player, hitter, time_from_last_punch, tool_capabilities) ~= false and damage == true end if damage == true and tool_capabilities then diff --git a/shields/init.lua b/shields/init.lua index 90636da..3128eff 100644 --- a/shields/init.lua +++ b/shields/init.lua @@ -29,7 +29,7 @@ armor:register_armor("shields:shield_admin", { description = S("Admin Shield"), inventory_image = "shields_inv_shield_admin.png", groups = {armor_shield=1000, armor_heal=100, armor_use=0, not_in_creative_inventory=1}, - on_punch = function(player, hitter, time_from_last_punch, tool_capabilities) + on_punched = function(player, hitter, time_from_last_punch, tool_capabilities) if type(hitter) == "userdata" then if hitter:is_player() then hitter:set_wielded_item("")