From d37840e022b11a0deefc798eb0d1197f4917dccf Mon Sep 17 00:00:00 2001 From: Eliy21 Date: Tue, 16 Jan 2024 18:53:40 +0000 Subject: [PATCH] Comment out cactus mob damage logic in preperation to move code logic to /mcl_mobs/physics.lua --- mods/ITEMS/mcl_core/nodes_cactuscane.lua | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/mods/ITEMS/mcl_core/nodes_cactuscane.lua b/mods/ITEMS/mcl_core/nodes_cactuscane.lua index d7abdfdf7..7f5f18966 100644 --- a/mods/ITEMS/mcl_core/nodes_cactuscane.lua +++ b/mods/ITEMS/mcl_core/nodes_cactuscane.lua @@ -137,20 +137,22 @@ minetest.register_node("mcl_core:reeds", { _mcl_hardness = 0, }) -local function cactus_damage_check(obj) +-- Moved cactus mob damage logic to /ENTITIES/mcl_mobs/physics.lua +--[[ +local function cactus_damage_check(obj, is_mob) -- where am I? local pos = obj:get_pos() if pos then -- Am I near a cactus? - local near = minetest.find_node_near(pos, 1, "mcl_core:cactus") + local near = minetest.find_node_near(pos, 1, "mcl_core:cactus", true) if not near and near ~= nil then - near = find_node_near({x=pos.x, y=pos.y-1, z=pos.z}, 1, "mcl_core:cactus") + near = find_node_near({x=pos.x, y=pos.y-1, z=pos.z}, 1, "mcl_core:cactus", true) end if near then -- Am I touching the cactus? If so, it hurts local dist = vector.distance(pos, near) local dist_feet = vector.distance({x=pos.x, y=pos.y-1, z=pos.z}, near) - if dist < 1.1 or dist_feet < 1.1 then + if dist < 1.1 or dist_feet < 1.1 or (is_mob and (dist < 1.25 or dist_feet < 1.9)) then if obj:get_hp() > 0 then mcl_util.deal_damage(obj, 1, {type = "cactus"}) end @@ -169,7 +171,8 @@ minetest.register_globalstep(function(dtime) --end for _,ent in pairs(minetest.luaentities) do if ent.is_mob then - cactus_damage_check(ent.object) + cactus_damage_check(ent.object, true) end end -end) \ No newline at end of file +end) +]] \ No newline at end of file