diff --git a/minetest.conf b/minetest.conf index 78468a9..cb98019 100755 --- a/minetest.conf +++ b/minetest.conf @@ -3,7 +3,7 @@ name = cessna151 ################Server##################### # server_announce = false -server_name = UGX testing +server_name = UGX Realms server_description = temp server for testing server_address = minetestservers.ddns.net server_url = @@ -11,13 +11,10 @@ max_users = 30 port = 33151 remote_port = 33151 motd = TBD............................................................ -enable_tnt = true disallow_empty_password = true -num_emerge_threads = 4 +num_emerge_threads = 4 #increase for faster mapgen server_unload_unused_data_timeout = 19 ask_reconnect_on_crash = true -#dropped item expire... -item_entity_ttl = 150 enable_rollback_recording = true debug_log_level = action strict_protocol_version_checking = false @@ -25,25 +22,27 @@ secure.trusted_mods = mysql_auth,mysql_base,sql,irc,stacktraceplus,multiskin secure.enable_security = false mysql_auth.cfgfile = /home/minetestservers/.minetest/worlds/UGXmr/mysql.cfgfile mysql_base.cfgfile = /home/minetestservers/.minetest/worlds/UGXmr/mysql.cfgfile +name_restrictions.pronounceability = # nil=disalbed, 0=everything blocked, .5=strict, 1=normal, 2=relaxed + # #################Game################## # +item_entity_ttl = 150 #dropped item expire... share_bones_time = 1800 -#If player dies in protected area... (0=disabled) -share_bones_time_early = 0 +share_bones_time_early = 0 #If player dies in protected area... (0=disabled) default_privs = interact, home, shout, spawn, fast enable_floating_dungeons = false give_initial_stuff = true -disable_fire = true +enable_fire = false playereffects_autosave = 60 enable_sprinting = true static_spawnpoint = 16390,28,20401 enable_tnt = false protector_hurt = 0 protector_flip = true -protector_spawn = 10 -protector_pvp = true -name_restrictions.pronounceability = # nil=disalbed, 0=everything blocked, .5=strict, 1=normal, 2=relaxed +protector_spawn = 35 +protector_pvp = false +protector_radius = 7 day_time_ratio = 75 night_time_ratio = 25 maximum_characters_per_message = 300 diff --git a/worldmods/maptools/priv.lua b/worldmods/maptools/priv.lua index f0d7815..f6ea853 100644 --- a/worldmods/maptools/priv.lua +++ b/worldmods/maptools/priv.lua @@ -4,7 +4,7 @@ local function kill_node(pos, node, puncher) puncher:get_player_name(), {worldedit = true}) then puncher:set_wielded_item("") minetest.log("action", puncher:get_player_name() .. - " tried to use a Super Pickaxe!") + " tried to use an Admin Pick!") return end @@ -13,37 +13,11 @@ local function kill_node(pos, node, puncher) minetest.log("action", puncher:get_player_name() .. " digs " .. nn .. " at " .. minetest.pos_to_string(pos) .. - " using an Admin Pickaxe!") + " using an Admin Pick!") local node_drops = minetest.get_node_drops(nn, "maptools:pick_admin") for i=1, #node_drops do local add_node = puncher:get_inventory():add_item("main", node_drops[i]) if add_node then minetest.add_item(pos, add_node) end end - minetest.remove_node(pos) - nodeupdate(pos) end end - -minetest.register_on_punchnode(function(pos, node, puncher) - kill_node(pos, node, puncher) -end) - -minetest.after(0.01, function () - minetest.after(0.01, function () - for node in pairs(minetest.registered_nodes) do - local def = minetest.registered_nodes[node] - for i in pairs(def) do - if i == "on_punch" then - local rem = def.on_punch - local function new_on_punch(pos, node, puncher, pointed_thing) - kill_node(pos, node, puncher) - return rem(pos, node, puncher, pointed_thing) - end - minetest.override_item(node, { - on_punch = new_on_punch - }) - end - end - end - end) -end) diff --git a/worldmods/time_regulation/init.lua b/worldmods/time_regulation/init.lua index c6ba003..cf476f4 100644 --- a/worldmods/time_regulation/init.lua +++ b/worldmods/time_regulation/init.lua @@ -218,7 +218,7 @@ function time_reg.loop(loop, forceupdate) time_reg.log("Entering day period : period skipped", "info") else minetest.settings:set("time_speed", time_reg.day_time_speed) - time_reg.log("Entering day period : time_speed " .. time_reg.day_time_speed, "info") + time_reg.log("Entering day period : time_speed " .. time_reg.day_time_speed, "action") end else if time_reg.ratio.night == 0 then @@ -226,7 +226,7 @@ function time_reg.loop(loop, forceupdate) time_reg.log("Entering night period : period skipped", "info") else minetest.settings:set("time_speed", time_reg.night_time_speed) - time_reg.log("Entering night period : time_speed " .. time_reg.night_time_speed, "info") + time_reg.log("Entering night period : time_speed " .. time_reg.night_time_speed, "action") end end end @@ -262,7 +262,7 @@ minetest.register_chatcommand("time_reg", { elseif param == "start" then local res = time_reg.start_loop() if res then - time_reg.set_status(time_reg.STATUS_ACTIVE, "ACTIVE") + t time_reg.set_status(time_reg.STATUS_ACTIVE, "ACTIVE") return true, "Loop started. Time regulation enabled" else return false, "Loop couldn't be started, it already is"