From b108f58b2f022a006fe01bfe156fbdc27ab7b836 Mon Sep 17 00:00:00 2001 From: NO411 Date: Sat, 9 Apr 2022 16:19:53 +0200 Subject: [PATCH 1/2] NO11 --- mods/ENTITIES/mcl_mobs/api.lua | 8 +++++++- mods/ITEMS/mcl_shields/init.lua | 17 +++++++++++------ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/mods/ENTITIES/mcl_mobs/api.lua b/mods/ENTITIES/mcl_mobs/api.lua index ca47d4be7..ea9235391 100644 --- a/mods/ENTITIES/mcl_mobs/api.lua +++ b/mods/ENTITIES/mcl_mobs/api.lua @@ -2833,6 +2833,10 @@ local do_states = function(self, dtime) end ent.switch = 1 ent.owner_id = tostring(self.object) -- add unique owner id to arrow + + -- important for mcl_shields + ent._shooter = self.object + ent._saved_shooter_pos = self.object:get_pos() end local amount = (vec.x * vec.x + vec.y * vec.y + vec.z * vec.z) ^ 0.5 @@ -4078,7 +4082,6 @@ end -- make explosion with protection and tnt mod check function mobs:boom(self, pos, strength, fire) - self.object:remove() if mod_explosions then if mobs_griefing and not minetest.is_protected(pos, "") then mcl_explosions.explode(pos, strength, { drop_chance = 1.0, fire = fire }, self.object) @@ -4088,6 +4091,9 @@ function mobs:boom(self, pos, strength, fire) else mobs:safe_boom(self, pos, strength) end + + -- delete the object after it punched the player to avoid nil entities in e.g. mcl_shields!! + self.object:remove() end diff --git a/mods/ITEMS/mcl_shields/init.lua b/mods/ITEMS/mcl_shields/init.lua index 5f5e78e38..a1be310e7 100644 --- a/mods/ITEMS/mcl_shields/init.lua +++ b/mods/ITEMS/mcl_shields/init.lua @@ -8,7 +8,7 @@ mcl_shields = { player = true, arrow = true, generic = true, - explosion = true, -- ghasts don't work + explosion = true, dragon_breath = true, }, enchantments = {"mending", "unbreaking"}, @@ -128,20 +128,24 @@ mcl_damage.register_modifier(function(obj, damage, reason) local type = reason.type local damager = reason.direct local blocking, shieldstack = mcl_shields.is_blocking(obj) + if not (obj:is_player() and blocking and mcl_shields.types[type] and damager) then return end local entity = damager:get_luaentity() - if entity and (type == "arrow" or type == "generic") then + if entity and entity._shooter then damager = entity._shooter end - if not damager then - return - end local dpos = damager:get_pos() - if dpos and vector.dot(obj:get_look_dir(), vector.subtract(dpos, obj:get_pos())) < 0 then + + -- Used for removed / killed entities before the projectile hits the player + if entity and not entity._shooter and entity._saved_shooter_pos then + dpos = entity._saved_shooter_pos + end + + if not dpos or vector.dot(obj:get_look_dir(), vector.subtract(dpos, obj:get_pos())) < 0 then return end @@ -150,6 +154,7 @@ mcl_damage.register_modifier(function(obj, damage, reason) if unbreaking > 0 then durability = durability * (unbreaking + 1) end + if not minetest.is_creative_enabled(obj:get_player_name()) and damage >= 3 then shieldstack:add_wear(65535 / durability) if blocking == 2 then From e790bf90f4795b9e2b0135ee463f01162f968cd7 Mon Sep 17 00:00:00 2001 From: NO411 Date: Sat, 9 Apr 2022 16:21:22 +0200 Subject: [PATCH 2/2] Make shields work with all mobs --- mods/ENTITIES/mcl_mobs/api.lua | 8 +++++++- mods/ITEMS/mcl_shields/init.lua | 17 +++++++++++------ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/mods/ENTITIES/mcl_mobs/api.lua b/mods/ENTITIES/mcl_mobs/api.lua index ca47d4be7..ea9235391 100644 --- a/mods/ENTITIES/mcl_mobs/api.lua +++ b/mods/ENTITIES/mcl_mobs/api.lua @@ -2833,6 +2833,10 @@ local do_states = function(self, dtime) end ent.switch = 1 ent.owner_id = tostring(self.object) -- add unique owner id to arrow + + -- important for mcl_shields + ent._shooter = self.object + ent._saved_shooter_pos = self.object:get_pos() end local amount = (vec.x * vec.x + vec.y * vec.y + vec.z * vec.z) ^ 0.5 @@ -4078,7 +4082,6 @@ end -- make explosion with protection and tnt mod check function mobs:boom(self, pos, strength, fire) - self.object:remove() if mod_explosions then if mobs_griefing and not minetest.is_protected(pos, "") then mcl_explosions.explode(pos, strength, { drop_chance = 1.0, fire = fire }, self.object) @@ -4088,6 +4091,9 @@ function mobs:boom(self, pos, strength, fire) else mobs:safe_boom(self, pos, strength) end + + -- delete the object after it punched the player to avoid nil entities in e.g. mcl_shields!! + self.object:remove() end diff --git a/mods/ITEMS/mcl_shields/init.lua b/mods/ITEMS/mcl_shields/init.lua index 5f5e78e38..a1be310e7 100644 --- a/mods/ITEMS/mcl_shields/init.lua +++ b/mods/ITEMS/mcl_shields/init.lua @@ -8,7 +8,7 @@ mcl_shields = { player = true, arrow = true, generic = true, - explosion = true, -- ghasts don't work + explosion = true, dragon_breath = true, }, enchantments = {"mending", "unbreaking"}, @@ -128,20 +128,24 @@ mcl_damage.register_modifier(function(obj, damage, reason) local type = reason.type local damager = reason.direct local blocking, shieldstack = mcl_shields.is_blocking(obj) + if not (obj:is_player() and blocking and mcl_shields.types[type] and damager) then return end local entity = damager:get_luaentity() - if entity and (type == "arrow" or type == "generic") then + if entity and entity._shooter then damager = entity._shooter end - if not damager then - return - end local dpos = damager:get_pos() - if dpos and vector.dot(obj:get_look_dir(), vector.subtract(dpos, obj:get_pos())) < 0 then + + -- Used for removed / killed entities before the projectile hits the player + if entity and not entity._shooter and entity._saved_shooter_pos then + dpos = entity._saved_shooter_pos + end + + if not dpos or vector.dot(obj:get_look_dir(), vector.subtract(dpos, obj:get_pos())) < 0 then return end @@ -150,6 +154,7 @@ mcl_damage.register_modifier(function(obj, damage, reason) if unbreaking > 0 then durability = durability * (unbreaking + 1) end + if not minetest.is_creative_enabled(obj:get_player_name()) and damage >= 3 then shieldstack:add_wear(65535 / durability) if blocking == 2 then