diff --git a/ctf/core.lua b/ctf/core.lua index 9e566cf..ebc67e4 100644 --- a/ctf/core.lua +++ b/ctf/core.lua @@ -171,18 +171,18 @@ function ctf._set(setting, default) end ctf._defsettings[setting] = default - if minetest.setting_get("ctf."..setting) then - ctf.log("settings", "- " .. setting .. ": " .. minetest.setting_get("ctf."..setting)) - elseif minetest.setting_get("ctf_"..setting) then - ctf.log("settings", "- " .. setting .. ": " .. minetest.setting_get("ctf_"..setting)) + if minetest.settings:get("ctf."..setting) then + ctf.log("settings", "- " .. setting .. ": " .. minetest.settings:get("ctf."..setting)) + elseif minetest.settings:get("ctf_"..setting) then + ctf.log("settings", "- " .. setting .. ": " .. minetest.settings:get("ctf_"..setting)) ctf.warning("settings", "deprecated setting ctf_"..setting.. " used, use ctf."..setting.." instead.") end end function ctf.setting(name) - local set = minetest.setting_get("ctf."..name) or - minetest.setting_get("ctf_"..name) + local set = minetest.settings:get("ctf."..name) or + minetest.settings:get("ctf_"..name) local dset = ctf._defsettings[name] if dset == nil then ctf.error("setting", "No such setting - " .. name) diff --git a/ctf_flag/flag_func.lua b/ctf_flag/flag_func.lua index a8a97bc..b6542c4 100644 --- a/ctf_flag/flag_func.lua +++ b/ctf_flag/flag_func.lua @@ -200,7 +200,7 @@ ctf_flag = { minetest.chat_send_player(name, "You're not allowed to place flags! Reported to admin for investigation.") minetest.set_node(pos, {name="air"}) if minetest.global_exists("chatplus") then - chatplus.send_mail("*SERVER*", minetest.setting_get("name"), + chatplus.send_mail("*SERVER*", minetest.settings:get("name"), "player " .. name .. " attempted to place flag!") end return