From 64ff61a4d2eb27daa14bb93e6a92be396d101ebf Mon Sep 17 00:00:00 2001 From: Starbeamrainbowlabs Date: Tue, 24 May 2022 02:24:43 +0100 Subject: [PATCH] Fix override aliases --- .luacheckrc | 3 ++- worldeditadditions_commands/aliases.lua | 9 ++++++--- worldeditadditions_core/core/register_alias.lua | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.luacheckrc b/.luacheckrc index 9ad6553..27630b7 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -33,6 +33,7 @@ read_globals = { "describe", "bonemeal", "dofile", - "PerlinNoise" + "PerlinNoise", + "Settings" } std = "max" diff --git a/worldeditadditions_commands/aliases.lua b/worldeditadditions_commands/aliases.lua index 28d3bc6..109f76f 100644 --- a/worldeditadditions_commands/aliases.lua +++ b/worldeditadditions_commands/aliases.lua @@ -15,9 +15,12 @@ wea_c.register_alias("mfacing", "mface") --- Overrides to core WorldEdit commands --- These are commented out for now, as they could be potentially dangerous to stability --- Thorough testing is required of our replacement commands before these are uncommented -if minetest.settings:get_bool("worldeditadditions.override_commands", false) then +-- These are disabled by default for now, as they could be potentially dangerous to stability +-- Thorough testing is required of our replacement commands before these are enabled by default +local worldmt_settings = Settings(minetest.get_worldpath().."/world.mt") +local should_override = worldmt_settings:get_bool("worldeditadditions_override_commands", false) +if should_override then + minetest.log("info", "[WorldEditAdditions] Enabling override aliases") worldeditadditions_core.register_alias("copy", "copy+", true) worldeditadditions_core.register_alias("move", "move+", true) worldeditadditions_core.register_alias("replace", "replacemix", true) diff --git a/worldeditadditions_core/core/register_alias.lua b/worldeditadditions_core/core/register_alias.lua index 0e448a7..70c7a1e 100644 --- a/worldeditadditions_core/core/register_alias.lua +++ b/worldeditadditions_core/core/register_alias.lua @@ -16,7 +16,7 @@ local function register_alias(cmdname_target, cmdname_source, override) return false end - print("DEBUG ALIAS source "..cmdname_source.." target "..cmdname_target) + -- print("DEBUG ALIAS source "..cmdname_source.." target "..cmdname_target) if minetest.chatcommands["/"..cmdname_target] then minetest.override_chatcommand(