Mirrorlandia_minetest/MineClone2
1
0
Fork 0
mirror of https://git.minetest.land/MineClone2/MineClone2.git synced 2024-11-30 06:43:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update drowning logic for lava and fireproof (still commented out)

Brandon 2020-07-08 17:31:08 -04:00
parent 3a3caf3885
commit abb5941616
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mods/ITEMS/mcl_potions/functions.lua

@ -263,7 +263,7 @@ local is_fire_node = { ["mcl_core:lava_flowing"]=true,
-- Prevent damage to player with Fire Resistance enabled -- Prevent damage to player with Fire Resistance enabled
minetest.register_on_player_hpchange(function(player, hp_change) minetest.register_on_player_hpchange(function(player, hp_change, reason)
if is_fire_proof[player] and hp_change < 0 then if is_fire_proof[player] and hp_change < 0 then
-- This is a bit forced, but it assumes damage is taken by fire and avoids it -- This is a bit forced, but it assumes damage is taken by fire and avoids it
@ -271,12 +271,10 @@ minetest.register_on_player_hpchange(function(player, hp_change)
-- it's worth noting that you don't take damage from players in this case... -- it's worth noting that you don't take damage from players in this case...
local player_info = mcl_playerinfo[player:get_player_name()] local player_info = mcl_playerinfo[player:get_player_name()]
-- if reason.type == "drown" then return hp_change
if is_fire_node[player_info.node_head] or is_fire_node[player_info.node_feet] or is_fire_node[player_info.node_stand] then if is_fire_node[player_info.node_head] or is_fire_node[player_info.node_feet] or is_fire_node[player_info.node_stand] then
-- if player:get_breath() == 0 and hp_change == -4 then -- probably drowning
-- return hp_change
-- else
return 0 return 0
-- end
else else
return hp_change return hp_change
end end