From f94e7fc52f8d069031ddc46be193293961d30720 Mon Sep 17 00:00:00 2001 From: James David Clarke Date: Tue, 9 Jan 2024 01:06:49 +0000 Subject: [PATCH 1/2] Fix mcl_shields is_blocking crash when object not found under player --- mods/ITEMS/mcl_shields/init.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mods/ITEMS/mcl_shields/init.lua b/mods/ITEMS/mcl_shields/init.lua index fa7714366..d1fa58bf2 100644 --- a/mods/ITEMS/mcl_shields/init.lua +++ b/mods/ITEMS/mcl_shields/init.lua @@ -112,6 +112,7 @@ end function mcl_shields.is_blocking(obj) if not obj:is_player() then return end + if mcl_shields.players[obj] then local blocking = mcl_shields.players[obj].blocking if blocking <= 0 then return @@ -123,6 +124,7 @@ function mcl_shields.is_blocking(obj) end return blocking, shieldstack end +end mcl_damage.register_modifier(function(obj, damage, reason) local type = reason.type From ee24b24c68f7ea30a30b9f558ff6df0dd58447c6 Mon Sep 17 00:00:00 2001 From: James David Clarke Date: Mon, 15 Jan 2024 00:30:14 +0000 Subject: [PATCH 2/2] Fix indentation --- mods/ITEMS/mcl_shields/init.lua | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mods/ITEMS/mcl_shields/init.lua b/mods/ITEMS/mcl_shields/init.lua index d1fa58bf2..6edee7e89 100644 --- a/mods/ITEMS/mcl_shields/init.lua +++ b/mods/ITEMS/mcl_shields/init.lua @@ -112,18 +112,18 @@ end function mcl_shields.is_blocking(obj) if not obj:is_player() then return end - if mcl_shields.players[obj] then - 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 end mcl_damage.register_modifier(function(obj, damage, reason)