Minetest/VoxeLibre
2
0
Fork 0
mirror of https://git.minetest.land/VoxeLibre/VoxeLibre.git synced 2024-11-19 01:21:05 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://git.minetest.land/Wuzzy/MineClone2

Browse source
This commit is contained in:
Elias Åström 2020-07-27 19:28:46 +02:00
commit 91b6213e0b
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
mods/ITEMS/mcl_potions/functions.lua
View file

@ -276,6 +276,8 @@ function mcl_potions._reset_player_effects(player)
if is_invisible[player] then if is_invisible[player] then
mcl_potions.make_invisible(player, false) mcl_potions.make_invisible(player, false)
is_invisible[player] = nil is_invisible[player] = nil
else --ensure player isn't invisible if he shouldn't be
mcl_potions.make_invisible(player, false)
end end
if is_poisoned[player] then if is_poisoned[player] then
@ -301,16 +303,22 @@ function mcl_potions._reset_player_effects(player)
if is_leaping[player] then if is_leaping[player] then
is_leaping[player] = nil is_leaping[player] = nil
playerphysics.remove_physics_factor(player, "jump", "mcl_potions:leaping") playerphysics.remove_physics_factor(player, "jump", "mcl_potions:leaping")
else -- ensure no effects are stuck from previous potions
playerphysics.remove_physics_factor(player, "jump", "mcl_potions:leaping")
end end
if is_swift[player] then if is_swift[player] then
is_swift[player] = nil is_swift[player] = nil
playerphysics.remove_physics_factor(player, "speed", "mcl_potions:swiftness") playerphysics.remove_physics_factor(player, "speed", "mcl_potions:swiftness")
else -- ensure no effects are stuck from previous potions
playerphysics.remove_physics_factor(player, "speed", "mcl_potions:swiftness")
end end
if is_cat[player] then if is_cat[player] then
player:override_day_night_ratio(nil) player:override_day_night_ratio(nil)
is_cat[player] = nil is_cat[player] = nil
else -- ensure no effects are stuck from previous potions
player:override_day_night_ratio(nil)
end end
if is_fire_proof[player] then if is_fire_proof[player] then
@ -321,6 +329,10 @@ end
minetest.register_on_leaveplayer( function(player) mcl_potions._reset_player_effects(player) end) minetest.register_on_leaveplayer( function(player) mcl_potions._reset_player_effects(player) end)
minetest.register_on_dieplayer( function(player) mcl_potions._reset_player_effects(player) end) minetest.register_on_dieplayer( function(player) mcl_potions._reset_player_effects(player) end)
-- TODO It's not MC-like to remove all potion effects when a player leaves or returns, but...it keeps
-- the server from crashing when it loops for a player that isn't online and by resetting on join, it
-- avoids effects present that shouldn't be
minetest.register_on_joinplayer( function(player) mcl_potions._reset_player_effects(player) end)
function mcl_potions.is_obj_hit(self, pos) function mcl_potions.is_obj_hit(self, pos)
@ -350,6 +362,7 @@ function mcl_potions.make_invisible(player, toggle)
local entity = player:get_luaentity() local entity = player:get_luaentity()
if toggle then -- hide player if toggle then -- hide player
if player:is_player() then if player:is_player() then
is_invisible[player].old_size = player:get_properties().visual_size is_invisible[player].old_size = player:get_properties().visual_size
elseif entity then elseif entity then
@ -357,11 +370,15 @@ function mcl_potions.make_invisible(player, toggle)
else -- if not a player or entity, do nothing else -- if not a player or entity, do nothing
return return
end end
player:set_properties({visual_size = {x = 0, y = 0}}) player:set_properties({visual_size = {x = 0, y = 0}})
player:set_nametag_attributes({color = {a = 0}}) player:set_nametag_attributes({color = {a = 0}})
else -- show player
elseif is_invisible[player] then -- show player
player:set_properties({visual_size = is_invisible[player].old_size}) player:set_properties({visual_size = is_invisible[player].old_size})
player:set_nametag_attributes({color = {a = 255}}) player:set_nametag_attributes({color = {a = 255}})
end end
end end