From 1a45ad19d4fa627e147bd385665e37942f6147fb Mon Sep 17 00:00:00 2001 From: Serhiy Zahoriya <serhiy.int@gmail.com> Date: Sat, 11 Jan 2020 22:06:24 +0100 Subject: [PATCH] Alloy furnace: Accept only unique ItemStacks from tubes (#523) --- technic/radiation.lua | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/technic/radiation.lua b/technic/radiation.lua index 6e518d8..e4ed5c5 100644 --- a/technic/radiation.lua +++ b/technic/radiation.lua @@ -294,6 +294,8 @@ end if ag.radiation then return 0.01 * ag.radiation + elseif armor_enabled then + return 0 end if ag.fleshy then return math.sqrt(0.01 * ag.fleshy) @@ -309,7 +311,7 @@ end local function dmg_object(pos, object, strength) - local obj_pos = vector.add(object:getpos(), calculate_object_center(object)) + local obj_pos = vector.add(object:get_pos(), calculate_object_center(object)) local mul if armor_enabled or entity_damage then -- we need to check may the object be damaged even if armor is disabled @@ -338,7 +340,7 @@ local max_dist = strength * rad_dmg_mult_sqrt for _, o in pairs(minetest.get_objects_inside_radius(pos, max_dist + abdomen_offset)) do - if entity_damage or o:is_player() then + if (entity_damage or o:is_player()) and o:get_hp() > 0 then dmg_object(pos, o, strength) end end @@ -513,4 +515,3 @@ end, }) end - -- Gitblit v1.8.0