Michieal
/
MineClone2
mirror of https://git.minetest.land/MineClone2/MineClone2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'Fix mcl_shields is_blocking crash when object not found under player' (#4134) from Impulse/MineClone2:mcl-shields-crash-fix into master 

Reviewed-on: MineClone2/MineClone2#4134
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
This commit is contained in:
the-real-herowl 2024-01-15 14:22:33 +00:00
parent c70ae8e535 ee24b24c68
commit 59ad110e6b
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mods/ITEMS/mcl_shields/init.lua
View File

@ -112,16 +112,18 @@ end
function mcl_shields.is_blocking(obj)
if not obj:is_player() then return end
local blocking = mcl_shields.players[obj].blocking
if blocking <= 0 then
return
end
if mcl_shields.players[obj] then
local blocking = mcl_shields.players[obj].blocking
if blocking <= 0 then
return
end
local shieldstack = obj:get_wielded_item()
if blocking == 1 then
shieldstack = obj:get_inventory():get_stack("offhand", 1)
local shieldstack = obj:get_wielded_item()
if blocking == 1 then
shieldstack = obj:get_inventory():get_stack("offhand", 1)
end
return blocking, shieldstack
end
return blocking, shieldstack
end
mcl_damage.register_modifier(function(obj, damage, reason)