mirror of
https://git.minetest.land/VoxeLibre/VoxeLibre.git
synced 2024-11-23 02:51:06 +01:00
Merge pull request 'Fix frost walker enchant not protecting from magma block damage (#2064)' (#2065) from frost_walker_fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2065 Reviewed-by: cora <cora@noreply.git.minetest.land>
This commit is contained in:
commit
d3bfdb190e
1 changed files with 2 additions and 1 deletions
|
@ -106,7 +106,8 @@ minetest.register_node("mcl_nether:magma", {
|
||||||
sounds = mcl_sounds.node_sound_stone_defaults(),
|
sounds = mcl_sounds.node_sound_stone_defaults(),
|
||||||
-- From walkover mod
|
-- From walkover mod
|
||||||
on_walk_over = function(loc, nodeiamon, player)
|
on_walk_over = function(loc, nodeiamon, player)
|
||||||
if player and player:get_player_control().sneak or minetest.global_exists("mcl_potions") and mcl_potions.player_has_effect(player, "fire_proof") then
|
local armor_feet = player:get_inventory():get_stack("armor", 5)
|
||||||
|
if player and player:get_player_control().sneak or (minetest.global_exists("mcl_enchanting") and mcl_enchanting.has_enchantment(armor_feet, "frost_walker")) or (minetest.global_exists("mcl_potions") and mcl_potions.player_has_effect(player, "fire_proof")) then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
-- Hurt players standing on top of this block
|
-- Hurt players standing on top of this block
|
||||||
|
|
Loading…
Reference in a new issue