From 7b24ede5826ba0158934e6cbee7e20d6f0cde455 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Wed, 16 Oct 2019 08:33:22 +0200 Subject: [PATCH] Remove a couple of FIXMEs and legacy --- mods/ITEMS/REDSTONE/mcl_dispensers/init.lua | 3 --- mods/ITEMS/mcl_farming/melon.lua | 2 +- mods/ITEMS/mcl_farming/pumpkin.lua | 2 +- mods/ITEMS/mcl_portals/portal_end.lua | 11 ----------- 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua b/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua index 2e5e3c6a1e..30d704065e 100644 --- a/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua +++ b/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua @@ -166,9 +166,6 @@ local dispenserdef = { local dropinv = dropmeta:get_inventory() if dropinv:room_for_item(armor_type, dropitem) then dropinv:add_item(armor_type, dropitem) - --[[ FIXME: For some reason, this function is not called after calling add_item, - so we call it manually to update the armor stand entity. - This may need investigation and the following line may be a small hack. ]] minetest.registered_nodes["3d_armor_stand:armor_stand"].on_metadata_inventory_put(standpos) stack:take_item() inv:set_stack("main", stack_id, stack) diff --git a/mods/ITEMS/mcl_farming/melon.lua b/mods/ITEMS/mcl_farming/melon.lua index 809cc01c18..18eb7faab0 100644 --- a/mods/ITEMS/mcl_farming/melon.lua +++ b/mods/ITEMS/mcl_farming/melon.lua @@ -39,7 +39,7 @@ local melon_base_def = { -- Drop proabilities for melon stem local stem_drop = { max_items = 1, - -- FIXME: The probabilities are slightly off from the original. + -- The probabilities are slightly off from the original. -- Update this drop list when the Minetest drop probability system -- is more powerful. items = { diff --git a/mods/ITEMS/mcl_farming/pumpkin.lua b/mods/ITEMS/mcl_farming/pumpkin.lua index 9050bdab7e..d10437479a 100644 --- a/mods/ITEMS/mcl_farming/pumpkin.lua +++ b/mods/ITEMS/mcl_farming/pumpkin.lua @@ -15,7 +15,7 @@ minetest.register_craftitem("mcl_farming:pumpkin_seeds", { local stem_drop = { max_items = 1, - -- FIXME: The probabilities are slightly off from the original. + -- The probabilities are slightly off from the original. -- Update this drop list when the Minetest drop probability system -- is more powerful. items = { diff --git a/mods/ITEMS/mcl_portals/portal_end.lua b/mods/ITEMS/mcl_portals/portal_end.lua index 84e98fee98..4b9a0bbb32 100644 --- a/mods/ITEMS/mcl_portals/portal_end.lua +++ b/mods/ITEMS/mcl_portals/portal_end.lua @@ -209,17 +209,6 @@ minetest.register_abm({ interval = 1, chance = 1, action = function(pos, node) - -- Destroy legacy end portals created with quartz block frame - -- by turning them into cobwebs. - -- We can tell if a end portal is legacy if it has portal_target as metadata. - -- FIXME: Remove this after some time. - local meta = minetest.get_meta(pos) - local legacy_portal_target = meta:get_string("portal_frame1") - if legacy_portal_target and legacy_portal_target ~= "" then - minetest.set_node(pos, {name="mcl_core:cobweb"}) - return - end - for _,obj in ipairs(minetest.get_objects_inside_radius(pos, 1)) do local lua_entity = obj:get_luaentity() --maikerumine added for objects to travel if obj:is_player() or lua_entity then