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/multitest/init.lua

@@ -1,7 +1,7 @@
 multitest = {}
 
-multitest.colors = {"black", "blue", "brown", "cyan", "dark_green", 
-"dark_grey", "green", "grey", "magenta", "orange", 
+multitest.colors = {"black", "blue", "brown", "cyan", "dark_green",
+"dark_grey", "green", "grey", "magenta", "orange",
 "pink", "red", "violet", "white", "yellow"}
 
 multitest.colornames = {"Black", "Blue", "Brown", "Cyan", "Dark Green",

mods/multitest/nodes.lua

@@ -24,7 +24,7 @@ minetest.register_node("multitest:blackstone_paved", {
     description = "Paved Blackstone",
 	tiles = {"multitest_blackstone_paved.png"},
 	groups = {cracky=2, stone=1},
-	sounds = default.node_sound_stone_defaults(),	
+	sounds = default.node_sound_stone_defaults(),
 })
 
 minetest.register_node("multitest:blackstone_paved", {
@@ -122,28 +122,28 @@ minetest.register_node("multitest:sandstone_carved", {
 })
 
 -- stairs:stair_blackstone
-stairs.register_stair_and_slab("blackstone", "multitest:blackstone", 
-	{cracky=3, stone=1}, 
-	{"multitest_blackstone.png"}, 
-	"Blackstone Stairs", 
+stairs.register_stair_and_slab("blackstone", "multitest:blackstone",
+	{cracky=3, stone=1},
+	{"multitest_blackstone.png"},
+	"Blackstone Stairs",
 	"Blackstone Slab", nil)
 
-stairs.register_stair_and_slab("blackcobble", "multitest:blackcobble", 
-	{cracky=3, stone=1}, 
-	{"multitest_blackcobble.png"}, 
-	"Black Cobble Stairs", 
+stairs.register_stair_and_slab("blackcobble", "multitest:blackcobble",
+	{cracky=3, stone=1},
+	{"multitest_blackcobble.png"},
+	"Black Cobble Stairs",
 	"Black Cobble Slab", nil)
 
-stairs.register_stair_and_slab("blackstone_bricks", "multitest:blackstone_brick", 
-	{cracky=3, stone=1}, 
-	{"multitest_blackstone_brick.png"}, 
-	"Blackstonestone brick Stairs", 
+stairs.register_stair_and_slab("blackstone_bricks", "multitest:blackstone_brick",
+	{cracky=3, stone=1},
+	{"multitest_blackstone_brick.png"},
+	"Blackstonestone brick Stairs",
 	"Blackstone Brick Slab", nil)
 
-stairs.register_stair_and_slab("blackstone_paved", "multitest:blackstone_paved", 
-	{cracky=3, stone=1}, 
-	{"multitest_blackstone_paved.png"}, 
-	"Paved Blackstone Stairs", 
+stairs.register_stair_and_slab("blackstone_paved", "multitest:blackstone_paved",
+	{cracky=3, stone=1},
+	{"multitest_blackstone_paved.png"},
+	"Paved Blackstone Stairs",
 	"Paved Blackstone Slab", nil)
 
 -- others

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)
-			update_players()
-			timer = 0
-		end
-	end)
+	local function tick()
+		update_players()
+		minetest.after(2, tick)
+	end
+	tick()
 
 	-- set background when player joins
 	minetest.register_on_joinplayer(function(player)
@@ -654,17 +655,21 @@ function nether_port(player, pos)
 		set_portal(known_portals_d, pos.z,pos.x, pos.y)
 		nether.player_from_nether(player)
 
-		local my = tonumber(meta:get_string("y"))
-		local y = get_portal(known_portals_u, pos.z,pos.x)
-		if y then
-			if y ~= my then
-				meta:set_string("y", y)
-			end
+		if minetest.setting_getbool("static_spawnpoint") then
+			local stsp_conf = minetest.setting_get("static_spawnpoint")
+			pos = minetest.string_to_pos(stsp_conf)
 		else
-			y = my or 100
+			local my = tonumber(meta:get_string("y"))
+			local y = get_portal(known_portals_u, pos.z,pos.x)
+			if y then
+				if y ~= my then
+					meta:set_string("y", y)
+				end
+			else
+				y = my or 100
+			end
+			pos.y = y
 		end
-		pos.y = y
-
 		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()
-			virtplayer:set_wielded_item((minetest.registered_items[wieldstack:get_name()] or {on_place=minetest.item_place}).on_place(wieldstack, virtplayer, pointed_thing) or wieldstack)
+			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/plantlife_modpack/dryplants/crafting.lua

@@ -2,10 +2,10 @@
 -- Dry Plants - Recipes 0.1.0 -- Short Grass -> Dirt
 -----------------------------------------------------------------------------------------------
 -- by Mossmanikin
--- License (everything): 	WTFPL		
+-- License (everything): 	WTFPL
 -- Looked at code from:		darkage, default, farming, sickle, stairs
 -- Dependencies: 			default, farming
--- Supports:				flint, stoneage, sumpf			
+-- Supports:				flint, stoneage, sumpf
 -----------------------------------------------------------------------------------------------
 
 -----------------------------------------------------------------------------------------------
@@ -220,7 +220,7 @@ for i in pairs(ReeD) do
 		recipe = {
 			{slab},
 		}
-	})	
+	})
 -----------------------------------------------------------------------------------------------
 -- Roof Corner
 -----------------------------------------------------------------------------------------------
@@ -343,7 +343,7 @@ minetest.register_craft({
 	burntime = 2,
 })
 -----------------------------------------------------------------------------------------------
--- Dandelion Leave 
+-- Dandelion Leave
 -----------------------------------------------------------------------------------------------
 --[[minetest.register_craftitem("dryplants:dandelion_leave", {
 	description = "Dandelion Leave",

mods/plantlife_modpack/dryplants/init.lua

@@ -7,10 +7,10 @@ local mname		= "dryplants"
 -- textures & ideas partly by Neuromancer
 
 -- License (everything): 	WTFPL
--- Contains code from: 		default, farming 
+-- Contains code from: 		default, farming
 -- Looked at code from:		darkage, sickle, stairs
 -- Dependencies: 			default, farming, biome_lib
--- Supports:				
+-- Supports:
 -----------------------------------------------------------------------------------------------
 abstract_dryplants = {}
 

mods/plantlife_modpack/dryplants/moregrass.lua

@@ -5,7 +5,7 @@
 
 -- License (everything): 	WTFPL
 -- Contains code from: 		biome_lib
--- Looked at code from:		default				
+-- Looked at code from:		default
 -----------------------------------------------------------------------------------------------
 
 abstract_dryplants.grow_grass = function(pos)

mods/plantlife_modpack/dryplants/reed.lua

@@ -4,7 +4,7 @@
 -- by Mossmanikin
 -- License (everything): 	WTFPL
 -- Looked at code from:		darkage, default, stairs
--- Dependencies: 			default			
+-- Dependencies: 			default
 -----------------------------------------------------------------------------------------------
 minetest.register_alias("stairs:stair_wetreed",				"dryplants:wetreed_roof")
 minetest.register_alias("stairs:slab_wetreed",				"dryplants:wetreed_slab")
@@ -93,7 +93,7 @@ if AUTO_ROOF_CORNER == true then
 			interval = 1,
 			chance = 1,
 			action = function(pos)
-	
+
 				local node_east = 			minetest.get_node({x=pos.x+1, y=pos.y, z=pos.z  })
 				local node_west = 			minetest.get_node({x=pos.x-1, y=pos.y, z=pos.z  })
 				local node_north = 			minetest.get_node({x=pos.x,   y=pos.y, z=pos.z+1})
@@ -106,7 +106,7 @@ if AUTO_ROOF_CORNER == true then
 				then
 					minetest.set_node(pos, {name=corner, param2=0})
 				end
-		
+
 				if ((node_north.name == roof and node_north.param2 == 1)
 				or (node_north.name == corner and node_north.param2 == 2))
 				and ((node_east.name == roof and node_east.param2 == 0)
@@ -114,7 +114,7 @@ if AUTO_ROOF_CORNER == true then
 				then
 					minetest.set_node(pos, {name=corner, param2=1})
 				end
-		
+
 				if ((node_east.name == roof and node_east.param2 == 2)
 				or (node_east.name == corner and node_east.param2 == 3))
 				and ((node_south.name == roof and node_south.param2 == 1)
@@ -122,7 +122,7 @@ if AUTO_ROOF_CORNER == true then
 				then
 					minetest.set_node(pos, {name=corner, param2=2})
 				end
-		
+
 				if ((node_south.name == roof and node_south.param2 == 3)
 				or (node_south.name == corner and node_south.param2 == 0))
 				and ((node_west.name == roof and node_west.param2 == 2)
@@ -138,7 +138,7 @@ if AUTO_ROOF_CORNER == true then
 				then
 					minetest.set_node(pos, {name=corner_2, param2=0})
 				end
-		
+
 				if ((node_north.name == roof and node_north.param2 == 3)
 				or (node_north.name == corner_2 and node_north.param2 == 2))
 				and ((node_east.name == roof and node_east.param2 == 2)
@@ -146,7 +146,7 @@ if AUTO_ROOF_CORNER == true then
 				then
 					minetest.set_node(pos, {name=corner_2, param2=1})
 				end
-		
+
 				if ((node_east.name == roof and node_east.param2 == 0)
 				or (node_east.name == corner_2 and node_east.param2 == 3))
 				and ((node_south.name == roof and node_south.param2 == 3)
@@ -154,7 +154,7 @@ if AUTO_ROOF_CORNER == true then
 				then
 					minetest.set_node(pos, {name=corner_2, param2=2})
 				end
-		
+
 				if ((node_south.name == roof and node_south.param2 == 1)
 				or (node_south.name == corner_2 and node_south.param2 == 0))
 				and ((node_west.name == roof and node_west.param2 == 0)
@@ -227,7 +227,7 @@ minetest.register_node("dryplants:wetreed_roof_corner_2", {
 	groups = {snappy=3, flammable=2},
 	sounds = default.node_sound_leaves_defaults(),
 })
-		
+
 -----------------------------------------------------------------------------------------------
 -- Wet Reed becomes (dry) Reed over time
 -----------------------------------------------------------------------------------------------

mods/plantlife_modpack/ferns/crafting.lua

@@ -2,7 +2,7 @@
 -- Ferns - Crafting 0.0.5
 -----------------------------------------------------------------------------------------------
 -- (by Mossmanikin)
--- License (everything): 	WTFPL			
+-- License (everything): 	WTFPL
 -----------------------------------------------------------------------------------------------
 minetest.register_craft({
 	type = "shapeless",

mods/signs_lib/depends.txt

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

mods/signs_lib/init.lua

@@ -479,7 +479,7 @@ signs_lib.update_sign = function(pos, fields, owner)
 
 		meta:set_string("infotext", ownstr..string.gsub(make_infotext(fields.text), "@KEYWORD", current_keyword).." ")
 		meta:set_string("text", fields.text)
-		
+
 		meta:set_int("__signslib_new_format", 1)
 		new = true
 	else