From d46cba50619a417063055f5789fe8619c3aeef7b Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sat, 25 Jan 2025 14:33:25 +0000 Subject: [PATCH] tidy --- admin.lua | 8 +++----- doors_chest.lua | 19 ++++++++----------- init.lua | 5 +---- 3 files changed, 12 insertions(+), 20 deletions(-) diff --git a/admin.lua b/admin.lua index c8ae75c..de4bab0 100644 --- a/admin.lua +++ b/admin.lua @@ -73,7 +73,7 @@ minetest.register_chatcommand("protector_replace", { minetest.register_abm({ nodenames = {"protector:protect", "protector:protect2", "protector:protect_hidden"}, - interval = 6, + interval = 5, chance = 1, catch_up = false, @@ -81,9 +81,7 @@ minetest.register_abm({ if removal_names == "" and replace_names == "" then return end - local meta = minetest.get_meta(pos) - - if not meta then return end + local meta = minetest.get_meta(pos) ; if not meta then return end local owner = meta:get_string("owner") @@ -166,7 +164,7 @@ minetest.register_node("protector:protect_hidden", { groups = {not_in_creative_inventory = 1, unbreakable = 1}, is_ground_content = false, on_blast = function() end, - -- 1px block inside door hinge near node top + -- 1px block to stop falling nodes replacing protector collision_box = { type = "fixed", fixed = {-15/32, 13/32, -15/32, -13/32, 1/2, -13/32} } diff --git a/doors_chest.lua b/doors_chest.lua index f3b5e0d..f07dc70 100644 --- a/doors_chest.lua +++ b/doors_chest.lua @@ -43,7 +43,8 @@ local function register_door(name, def) if minetest.registered_nodes[nu.name] and minetest.registered_nodes[nu.name].on_rightclick then - return minetest.registered_nodes[nu.name].on_rightclick(ptu, nu, placer, itemstack) + return minetest.registered_nodes[nu.name].on_rightclick( + ptu, nu, placer, itemstack) end local pt = pointed_thing.above @@ -66,14 +67,10 @@ local function register_door(name, def) local p2 = minetest.dir_to_facedir(placer:get_look_dir()) local pt3 = {x = pt.x, y = pt.y, z = pt.z} - if p2 == 0 then - pt3.x = pt3.x - 1 - elseif p2 == 1 then - pt3.z = pt3.z + 1 - elseif p2 == 2 then - pt3.x = pt3.x + 1 - elseif p2 == 3 then - pt3.z = pt3.z - 1 + if p2 == 0 then pt3.x = pt3.x - 1 + elseif p2 == 1 then pt3.z = pt3.z + 1 + elseif p2 == 2 then pt3.x = pt3.x + 1 + elseif p2 == 3 then pt3.z = pt3.z - 1 end if minetest.get_item_group(minetest.get_node(pt3).name, "prot_door") == 0 then @@ -346,7 +343,7 @@ register_door(name, { description = S("Protected Steel Door"), inventory_image = "doors_steel.png^protector_logo.png", groups = { - snappy = 1, bendy = 2, cracky = 1, + snappy = 1, cracky = 1, level = (mcl and 0 or 2), pickaxey = 2, unbreakable = 1 }, tiles_bottom = {"doors_steel_b.png^protector_logo.png", "doors_grey.png"}, @@ -485,7 +482,7 @@ register_trapdoor("protector:trapdoor_steel", { tile_front = "doors_trapdoor_steel.png^protector_logo.png", tile_side = "doors_trapdoor_steel_side.png", groups = { - snappy = 1, bendy = 2, cracky = 1, melty = 2, level = (mcl and 0 or 2), + snappy = 1, bendy = 2, cracky = 1, level = (mcl and 0 or 2), unbreakable = 1, pickaxey = 2 }, _mcl_hardness = 1, diff --git a/init.lua b/init.lua index 651d5db..077f11c 100644 --- a/init.lua +++ b/init.lua @@ -97,9 +97,7 @@ local function is_member(meta, name) for _, f in ipairs(player_factions) do - if factions.player_is_in_faction(f, owner) then - return true - end + if factions.player_is_in_faction(f, owner) then return true end end end end @@ -226,7 +224,6 @@ local function protector_formspec(meta) -- username add button .."button[" .. (i % 4 * 2 + 1.25) .. "," .. math_floor(i / 4 + 3) .. ";.75,.5;protector_submit;+]" - end return formspec