From 11f2b4f4b317a25972733e3d3fe9f2dc6ce31c6a Mon Sep 17 00:00:00 2001 From: David Leal <halfpacho@gmail.com> Date: Sat, 05 Sep 2020 18:54:37 +0200 Subject: [PATCH] Fix warning reported by LuaCheck (#563) --- technic/machines/MV/lighting.lua | 33 +++++++++------------------------ 1 files changed, 9 insertions(+), 24 deletions(-) diff --git a/technic/machines/MV/lighting.lua b/technic/machines/MV/lighting.lua index 76fcb20..f7c9124 100644 --- a/technic/machines/MV/lighting.lua +++ b/technic/machines/MV/lighting.lua @@ -14,20 +14,7 @@ function technic_homedecor_node_is_owned(pos, placer) local ownername = false - if type(IsPlayerNodeOwner) == "function" then -- node_ownership mod - if HasOwner(pos, placer) then - if not IsPlayerNodeOwner(pos, placer:get_player_name()) then - if type(getLastOwner) == "function" then -- ...is an old version - ownername = getLastOwner(pos) - elseif type(GetNodeOwnerName) == "function" then -- ...is a recent version - ownername = GetNodeOwnerName(pos) - else - ownername = S("someone") - end - end - end - - elseif type(isprotect) == "function" then -- glomie's protection mod + if type(isprotect) == "function" then -- glomie's protection mod if not isprotect(5, pos, placer) then ownername = S("someone") end @@ -45,11 +32,10 @@ end end -local dirs1 = {20, 23, 22, 21} local dirs2 = {9, 18, 7, 12} local technic_homedecor_rotate_and_place = function(itemstack, placer, pointed_thing) - if not technic_homedecor_node_is_owned(pointed_thing.under, placer) + if not technic_homedecor_node_is_owned(pointed_thing.under, placer) and not technic_homedecor_node_is_owned(pointed_thing.above, placer) then local node = minetest.get_node(pointed_thing.under) if not minetest.registered_nodes[node.name] or not minetest.registered_nodes[node.name].on_rightclick then @@ -58,7 +44,6 @@ local under = pointed_thing.under local pitch = placer:get_look_pitch() local pname = minetest.get_node(under).name - local node = minetest.get_node(above) local fdir = minetest.dir_to_facedir(placer:get_look_dir()) local wield_name = itemstack:get_name() @@ -76,7 +61,7 @@ if not minetest.registered_nodes[minetest.get_node(pos1).name]["buildable_to"] then return end - if iswall then + if iswall then minetest.add_node(pos1, {name = wield_name, param2 = dirs2[fdir+1] }) -- place wall variant elseif isceiling then minetest.add_node(pos1, {name = wield_name, param2 = 20 }) -- place upside down variant @@ -159,7 +144,7 @@ paramtype = "light", paramtype2 = "facedir", walkable = true, - light_source = LIGHT_MAX, + light_source = minetest.LIGHT_MAX, sounds = default.node_sound_wood_defaults(), groups = { snappy = 3, not_in_creative_inventory=1}, @@ -240,7 +225,7 @@ paramtype = "light", paramtype2 = "facedir", walkable = true, - light_source = LIGHT_MAX-1, + light_source = minetest.LIGHT_MAX-1, sounds = default.node_sound_wood_defaults(), groups = { snappy = 3, not_in_creative_inventory=1}, @@ -322,7 +307,7 @@ paramtype = "light", paramtype2 = "facedir", walkable = true, - light_source = LIGHT_MAX, + light_source = minetest.LIGHT_MAX, sounds = default.node_sound_wood_defaults(), groups = { snappy = 3, not_in_creative_inventory=1}, @@ -403,7 +388,7 @@ paramtype = "light", paramtype2 = "facedir", walkable = true, - light_source = LIGHT_MAX-1, + light_source = minetest.LIGHT_MAX-1, sounds = default.node_sound_wood_defaults(), groups = { snappy = 3, not_in_creative_inventory=1}, @@ -484,7 +469,7 @@ paramtype = "light", paramtype2 = "facedir", walkable = true, - light_source = LIGHT_MAX-1, + light_source = minetest.LIGHT_MAX-1, sounds = default.node_sound_wood_defaults(), groups = { snappy = 3, not_in_creative_inventory=1}, @@ -565,7 +550,7 @@ paramtype = "light", paramtype2 = "facedir", walkable = true, - light_source = LIGHT_MAX-1, + light_source = minetest.LIGHT_MAX-1, sounds = default.node_sound_wood_defaults(), groups = { snappy = 3, not_in_creative_inventory=1}, -- Gitblit v1.8.0