Update from Creative's repository

- For MinetestForFun/server-minetestforfun-creative#57

mods/automappercolors/init.lua

@@ -9,7 +9,7 @@ function amc_dumpnodes()
 	local n = 0
 	for name, def in pairs(minetest.registered_nodes) do
 		if def.drawtype ~= 'airlike' then
-			local tile = def.tiles
+			local tile = def.tiles or def.tile_images
 			if type(tile) == 'table' then
 				tile = tile[1]
 				if type(tile) == 'table' then

mods/locked_sign/init.lua

@@ -28,7 +28,7 @@ minetest.register_node("locked_sign:sign_wall_locked", {
 	on_construct = function(pos)
 		--local n = minetest.get_node(pos)
 		local meta = minetest.get_meta(pos)
-		meta:set_string("formspec", "hack:sign_text_input")
+		meta:set_string("formspec", "field[text;;${text}]")
 		meta:set_string("infotext", "\"\"")
 	end,
 	can_dig = function(pos,player)
@@ -42,13 +42,12 @@ minetest.register_node("locked_sign:sign_wall_locked", {
 		local meta = minetest.get_meta(pos)
 		local owner = meta:get_string("owner")
 		local pname = sender:get_player_name()
-		if pname ~= owner and pname ~= minetest.setting_get("name")
-		  and not minetest.check_player_privs(pname, {sign_editor=true}) then
+		if pname ~= owner and pname ~= minetest.setting_get("name") then
 			return
 		end
 		local meta = minetest.get_meta(pos)
 		fields.text = fields.text or ""
-		print((sender:get_player_name() or "").." wrote \""..fields.text..
+		minetest.log("action", (sender:get_player_name() or "").." wrote \""..fields.text..
 				"\" to sign at "..minetest.pos_to_string(pos))
 		meta:set_string("text", fields.text)
 		meta:set_string("infotext", "\"" .. fields.text .. "\" (owned by " .. sender:get_player_name() .. ")")

mods/maptools/default_nodes.lua

@@ -603,5 +603,5 @@ minetest.register_node("maptools:chest",{
 	on_metadata_inventory_move = chestdef.on_metadata_inventory_move,
 	on_metadata_inventory_put  = chestdef.on_metadata_inventory_put,
 	on_metadata_inventory_take = chestdef.on_metadata_inventory_take,
-	groups = {unbreakable = 1},
+	groups = {unbreakable = 1, not_in_creative_inventory = 1},
 })

mods/maptools/nodes.lua

@@ -356,24 +356,14 @@ minetest.register_node("maptools:ladder", {
 	sounds = default.node_sound_wood_defaults(),
 })
 
-minetest.register_node("maptools:permanent_fire", {
-	description = S("Permanent Fire"),
-	range = 12,
-	stack_max = 10000,
-	drawtype = "plantlike",
-	paramtype = "light",
-	tiles = {{
-		name="fire_basic_flame_animated.png",
-		animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1},
-	}},
-	inventory_image = "fire_basic_flame.png",
-	light_source = 14,
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sunlight_propagates = true,
-	walkable = false,
-	damage_per_second = 4,
-})
+local permafire = table.copy(minetest.registered_nodes["fire:basic_flame"])
+permafire.damage_per_second = 4
+permafire.stack_max = 10000
+permafire.range = 12
+permafire.description = S("Permanent Fire")
+permafire.groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative}
+
+minetest.register_node("maptools:permanent_fire", permafire)
 
 minetest.register_node("maptools:fake_fire", {
 	description = S("Fake Fire"),

mods/mobs/api.lua

@@ -2472,7 +2472,9 @@ function mobs:register_egg(mob, desc, background, addegg)
 		inventory_image = invimg,
 
 		on_place = function(itemstack, placer, pointed_thing)
-
+			if not minetest.check_player_privs(placer:get_player_name(), {server=true}) then -- MFF
+				return
+			end
 			local pos = pointed_thing.above
 
 			if pos

mods/mobs/chicken.lua

@@ -7,8 +7,8 @@ mobs:register_mob("mobs:chicken", {
 	-- is it aggressive
 	passive = true,
 	-- health & armor
-	hp_min = 5,
-	hp_max = 10,
+	hp_min = 4,
+	hp_max = 8,
 	armor = 200,
 	-- textures and model
 	collisionbox = {-0.3, -0.75, -0.3, 0.3, 0.1, 0.3},

mods/mobs/dungeonmaster.lua

@@ -1,6 +1,9 @@
 
 -- Dungeon Master by PilzAdam
 
+-- Node which cannot be destroyed by DungeonMasters' fireballs
+local excluded = {"nether:netherrack","default:obsidian_glass","default:obsidian", "default:obsidian_cooled", "default:bedrock", "doors:door_steel_b_1", "doors:door_steel_t_1", "doors:door_steel_b_2", "doors:door_steel_t_2","default:chest_locked"}
+
 mobs:register_mob("mobs:dungeon_master", {
 	-- animal, monster, npc, barbarian
 	type = "monster",
@@ -92,7 +95,7 @@ mobs:register_arrow("mobs:fireball", {
 		}, nil)
 	end,
 
-	-- node hit, bursts into flame
+	-- node hit, bursts into flame (cannot blast through obsidian or protection redo mod items)
 	hit_node = function(self, pos, node)
 		mobs:explosion(pos, 1, 1, 0)
 	end

mods/nether/nether/init.lua

@@ -142,15 +142,16 @@ local function do_ws_func(depth, a, x)
 	return SIZE*y/math.pi
 end
 
+local chunksize = minetest.setting_get("chunksize") or 5
 local ws_lists = {}
-local function get_ws_list(a,x, sidelength)
+local function get_ws_list(a,x)
         ws_lists[a] = ws_lists[a] or {}
         local v = ws_lists[a][x]
         if v then
                 return v
         end
         v = {}
-        for x=x,x + (sidelength - 1) do
+        for x=x,x + (chunksize*16 - 1) do
 		local y = do_ws_func(ssize, a, x)
                 v[x] = y
         end

mods/nether/nether/portal.lua

@@ -178,7 +178,12 @@ minetest.register_chatcommand("from_hell", {
 		minetest.chat_send_player(pname, "You are free now")
 		player_from_nether(player)
 		local pos = player:getpos()
-		player:moveto({x=pos.x, y=100, z=pos.z})
+		local pos_togo = {x=pos.x, y=100, z=pos.z}
+		if minetest.setting_getbool("static_spawnpoint") ~= nil then
+			local stsp_conf = minetest.setting_get("static_spawnpoint")
+			pos_togo = {x = stsp_conf:split(",")[1]+0,y = stsp_conf:split(",")[2]+0,z = stsp_conf:split(",")[3]+0}
+		end
+		player:moveto(pos_togo)
 		return true, pname.." is now out of the nether."
 	end
 })]]
@@ -227,15 +232,11 @@ if nether_prisons then
 	end
 
 	-- fix wrong player positions
-	local timer = 0	--doesn't work if the server lags
-	minetest.register_globalstep(function(dtime)
-		timer = timer + dtime;
-		if timer >= 2 then
-			--minetest.after(1, update_players)
+	local function tick()
 		update_players()
-			timer = 0
+		minetest.after(2, tick)
 	end
-	end)
+	tick()
 
 	-- set background when player joins
 	minetest.register_on_joinplayer(function(player)
@@ -654,6 +655,10 @@ function nether_port(player, pos)
 		set_portal(known_portals_d, pos.z,pos.x, pos.y)
 		nether.player_from_nether(player)
 
+		if minetest.setting_getbool("static_spawnpoint") then
+			local stsp_conf = minetest.setting_get("static_spawnpoint")
+			pos = minetest.string_to_pos(stsp_conf)
+		else
 			local my = tonumber(meta:get_string("y"))
 			local y = get_portal(known_portals_u, pos.z,pos.x)
 			if y then
@@ -664,7 +669,7 @@ function nether_port(player, pos)
 				y = my or 100
 			end
 			pos.y = y
-
+		end
 		player:moveto(pos)
 	else
 		set_portal(known_portals_u, pos.z,pos.x, pos.y)

mods/pipeworks/wielder.lua

@@ -408,7 +408,17 @@ if pipeworks.enable_deployer then
 		sneak = false,
 		act = function(virtplayer, pointed_thing)
 			local wieldstack = virtplayer:get_wielded_item()
+			if not minetest.setting_getbool("creative_mode") then
 				virtplayer:set_wielded_item((minetest.registered_items[wieldstack:get_name()] or {on_place=minetest.item_place}).on_place(wieldstack, virtplayer, pointed_thing) or wieldstack)
+			else
+				local stack = (minetest.registered_items[wieldstack:get_name()] or {on_place=minetest.item_place}).on_place(wieldstack, virtplayer, pointed_thing)
+				if stack:get_name() ~= wieldstack:get_name() or stack:get_count() ~= wieldstack:get_count() then
+					virtplayer:set_wielded_item(stack)
+				else -- Manual decrease
+					wieldstack:take_item(1)
+					virtplayer:set_wielded_item(wieldstack)
+				end
+			end
 		end,
 		eject_drops = false,
 	})

mods/signs_lib/depends.txt

@@ -2,3 +2,4 @@ default
 intllib?
 screwdriver?
 keyword_interact?
+locked_sign?

mods/warps/init.lua

@@ -139,7 +139,6 @@ minetest.register_chatcommand("setwarp", {
 	description = "Set a warp location to the players location",
 	privs = { warp_admin = true },
 	func = function(name, param)
-		param = param:gsub("%W", "")
 		local h = "created"
 		for i = 1,table.getn(warps) do
 			if warps[i].name == param then
@@ -150,6 +149,9 @@ minetest.register_chatcommand("setwarp", {
 		end
 		local player = minetest.get_player_by_name(name)
 		local pos = player:getpos()
+		if not pos then
+			return false, "Internal error while getting your position. Please try again later"
+		end
 		table.insert(warps, { name = param, x = pos.x, y = pos.y, z = pos.z, yaw = player:get_look_yaw(), pitch = player:get_look_pitch() })
 		save()
 		minetest.log("action", name .. " " .. h .. " warp \"" .. param .. "\": " .. pos.x .. ", " .. pos.y .. ", " .. pos.z)