lanxu/MineClone2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Fix invisibility potion crash; alternative of: #2632' (#2634) from mrrar_invis into master

Browse Source 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2634
Reviewed-by: cora <cora@noreply.git.minetest.land>
This commit is contained in:
cora 2022-09-09 20:23:23 +00:00
commit 9b07f3cffb
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
mods/ITEMS/mcl_potions/functions.lua
View File

@ -375,38 +375,41 @@ end, -50)
-- ███████╗╚█████╔╝██║░░██║██████╔╝██╔╝░░░██████╔╝██║░░██║░░╚██╔╝░░███████╗ -- ███████╗╚█████╔╝██║░░██║██████╔╝██╔╝░░░██████╔╝██║░░██║░░╚██╔╝░░███████╗
-- ╚══════╝░╚════╝░╚═╝░░╚═╝╚═════╝░╚═╝░░░░╚═════╝░╚═╝░░╚═╝░░░╚═╝░░░╚══════╝ -- ╚══════╝░╚════╝░╚═╝░░╚═╝╚═════╝░╚═╝░░░░╚═════╝░╚═╝░░╚═╝░░░╚═╝░░░╚══════╝
function mcl_potions._clear_cached_player_data(player)
function mcl_potions._reset_player_effects(player, set_hud)
if not player:is_player() then
return
end
meta = player:get_meta()
mcl_potions.make_invisible(player, false)
EF.invisible[player] = nil EF.invisible[player] = nil
EF.poisoned[player] = nil EF.poisoned[player] = nil
EF.regenerating[player] = nil EF.regenerating[player] = nil
EF.strong[player] = nil EF.strong[player] = nil
EF.weak[player] = nil EF.weak[player] = nil
EF.water_breathing[player] = nil EF.water_breathing[player] = nil
EF.leaping[player] = nil EF.leaping[player] = nil
EF.swift[player] = nil
EF.night_vision[player] = nil
EF.fire_proof[player] = nil
meta = player:get_meta()
meta:set_int("night_vision", 0)
end
function mcl_potions._reset_player_effects(player, set_hud)
if not player:is_player() then
return
end
mcl_potions.make_invisible(player, false)
playerphysics.remove_physics_factor(player, "jump", "mcl_potions:leaping") playerphysics.remove_physics_factor(player, "jump", "mcl_potions:leaping")
EF.swift[player] = nil
playerphysics.remove_physics_factor(player, "speed", "mcl_potions:swiftness") playerphysics.remove_physics_factor(player, "speed", "mcl_potions:swiftness")
EF.night_vision[player] = nil
meta:set_int("night_vision", 0)
mcl_weather.skycolor.update_sky_color({player}) mcl_weather.skycolor.update_sky_color({player})
EF.fire_proof[player] = nil
if set_hud ~= false then if set_hud ~= false then
potions_set_hud(player) potions_set_hud(player)
end end
mcl_potions._clear_cached_player_data(player)
end end
function mcl_potions._save_player_effects(player) function mcl_potions._save_player_effects(player)
@ -489,7 +492,7 @@ end
minetest.register_on_leaveplayer( function(player) minetest.register_on_leaveplayer( function(player)
mcl_potions._save_player_effects(player) mcl_potions._save_player_effects(player)
mcl_potions._reset_player_effects(player) -- clearout the buffer to prevent looking for a player not there mcl_potions._clear_cached_player_data(player) -- clearout the buffer to prevent looking for a player not there
icon_ids[player:get_player_name()] = nil icon_ids[player:get_player_name()] = nil
end) end)