Version MFF.

.luacheckrc

@@ -1,17 +0,0 @@
-unused_args = false
-allow_defined_top = true
-
-read_globals = {
-	"DIR_DELIM",
-	"minetest", "core",
-	"dump",
-	"vector",
-	"VoxelManip", "VoxelArea",
-	"PseudoRandom", "ItemStack",
-}
-
--- Overwrites minetest.handle_node_drops
-files["mods/creative/init.lua"].globals = { "minetest" }
-
--- Don't report on legacy definitions of globals.
-files["mods/default/legacy.lua"].global = false

.travis.yml

@@ -1,12 +0,0 @@
-language: generic
-sudo: false
-addons:
-  apt:
-    packages:
-    - luarocks
-before_install:
-  - luarocks install --local luacheck
-script: 
-- $HOME/.luarocks/bin/luacheck --no-color ./mods
-notifications:
-  email: false

game.conf

@@ -1 +1 @@
-name = Minetest Game
+name = MinetestForFun Game

game_api.txt

@@ -70,17 +70,7 @@ Beds API
 Creative API
 ------------
 
-Use `creative.register_tab(name, title, items)` to add a tab with filtered items.
-For example,
-
-	creative.register_tab("tools", "Tools", minetest.registered_tools)
-
-is used to show all tools. Name is used in the sfinv page name, title is the
-human readable title.
-
-The contents of `creative.formspec_add` is appended to every creative inventory
-page. Mods can use it to add additional formspec elements onto the default
-creative inventory formspec to be drawn after each update.
+A global string called `creative.formspec_add` was added which allows mods to add additional formspec elements onto the default creative inventory formspec to be drawn after each update.
 
 Doors API
 ---------
@@ -401,100 +391,6 @@ set a players home position and teleport a player to home position.
  * return value: false if player cannot be sent home, otherwise true
 
 
-Sfinv API
----------
-
-### sfinv Methods
-
-* sfinv.set_player_inventory_formspec(player, context) - builds page formspec
-            and calls set_inventory_formspec().
-            If context is nil, it is either found or created.
-* sfinv.get_formspec(player, context) - builds current page's formspec
-* sfinv.get_nav_fs(player, context, nav, current_idx) - see above
-* sfinv.get_homepage_name(player) - get the page name of the first page to show to a player
-* sfinv.make_formspec(player, context, content, show_inv, size) - adds a theme to a formspec
-    * show_inv, defaults to false. Whether to show the player's main inventory
-    * size, defaults to `size[8,8.6]` if not specified
-* sfinv.register_page(name, def) - register a page, see section below
-* sfinv.override_page(name, def) - overrides fields of an page registered with register_page.
-    * Note: Page must already be defined, (opt)depend on the mod defining it.
-
-### sfinv Members
-
-* pages - table of pages[pagename] = def
-* pages_unordered - array table of pages in order of addition (used to build navigation tabs).
-* contexts - contexts[playername] = player_context
-* enabled - set to false to disable. Good for inventory rehaul mods like unified inventory
-
-### Context
-
-A table with these keys:
-
-* page - current page name
-* nav - a list of page names
-* nav_titles - a list of page titles
-* nav_idx - current nav index (in nav and nav_titles)
-* any thing you want to store
-    * sfinv will clear the stored data on log out / log in
-
-### sfinv.register_page
-
-sfinv.register_page(name, def)
-
-def is a table containing:
-
-* `title` - human readable page name (required)
-* `get(self, player, context)` - returns a formspec string. See formspec variables. (required)
-* `is_in_nav(self, player, context)` - return true to show in the navigation (the tab header, by default)
-* `on_player_receive_fields(self, player, context, fields)` - on formspec submit.
-* `on_enter(self, player, context)` - called when the player changes pages, usually using the tabs.
-* `on_leave(self, player, context)` - when leaving this page to go to another, called before other's on_enter
-
-### get formspec
-
-Use sfinv.make_formspec to apply a layout:
-
-	return sfinv.make_formspec(player, context, [[
-		list[current_player;craft;1.75,0.5;3,3;]
-		list[current_player;craftpreview;5.75,1.5;1,1;]
-		image[4.75,1.5;1,1;gui_furnace_arrow_bg.png^[transformR270]
-		listring[current_player;main]
-		listring[current_player;craft]
-		image[0,4.25;1,1;gui_hb_bg.png]
-		image[1,4.25;1,1;gui_hb_bg.png]
-		image[2,4.25;1,1;gui_hb_bg.png]
-		image[3,4.25;1,1;gui_hb_bg.png]
-		image[4,4.25;1,1;gui_hb_bg.png]
-		image[5,4.25;1,1;gui_hb_bg.png]
-		image[6,4.25;1,1;gui_hb_bg.png]
-		image[7,4.25;1,1;gui_hb_bg.png]
-	]], true)
-
-See above (methods section) for more options.
-
-### Customising themes
-
-Simply override this function to change the navigation:
-
-	function sfinv.get_nav_fs(player, context, nav, current_idx)
-		return "navformspec"
-	end
-
-And override this function to change the layout:
-
-	function sfinv.make_formspec(player, context, content, show_inv, size)
-		local tmp = {
-			size or "size[8,8.6]",
-			theme_main,
-			sfinv.get_nav_fs(player, context, context.nav_titles, context.nav_idx),
-			content
-		}
-		if show_inv then
-			tmp[4] = theme_inv
-		end
-		return table.concat(tmp, "")
-	end
-
 Stairs API
 ----------
 
@@ -754,83 +650,3 @@ Trees
 
  * `default.grow_new_snowy_pine_tree(pos)`
   * Grows a new design snowy pine tree at pos
-
-Carts
------
-
-	carts.register_rail(
-		"mycarts:myrail", -- Rail name
-		nodedef,          -- standard nodedef
-		railparams        -- rail parameter struct (optional)
-	)
-
-	railparams = {
-		on_step(obj, dtime), -- Event handler called when
-		                     -- cart is on rail
-		acceleration, -- integer acceleration factor (negative
-		              -- values to brake)
-	}
-
-	The event handler is called after all default calculations
-	are made, so the custom on_step handler can override things
-	like speed, acceleration, player attachment. The handler will
-	likely be called many times per second, so the function needs
-	to make sure that the event is handled properly.
-
-Key API
--------
-
-The key API allows mods to add key functionality to nodes that have
-ownership or specific permissions. Using the API will make it so
-that a node owner can use skeleton keys on their nodes to create keys
-for that node in that location, and give that key to other players,
-allowing them some sort of access that they otherwise would not have
-due to node protection.
-
-To make your new nodes work with the key API, you need to register
-two callback functions in each nodedef:
-
-
-`on_key_use(pos, player)`
- * Is called when a player right-clicks (uses) a normal key on your
- * node.
- * `pos` - position of the node
- * `player` - PlayerRef
- * return value: none, ignored
-
-The `on_key_use` callback should validate that the player is wielding
-a key item with the right key meta secret. If needed the code should
-deny access to the node functionality.
-
-If formspecs are used, the formspec callbacks should duplicate these
-checks in the metadata callback functions.
-
-
-`on_skeleton_key_use(pos, player, newsecret)`
-
- * Is called when a player right-clicks (uses) a skeleton key on your
- * node.
- * `pos` - position of the node
- * `player` - PlayerRef
- * `newsecret` - a secret value(string)
- * return values:
- * `secret` - `nil` or the secret value that unlocks the door
- * `name` - a string description of the node ("a locked chest")
- * `owner` - name of the node owner
-
-The `on_skeleton_key_use` function should validate that the player has
-the right permissions to make a new key for the item. The newsecret
-value is useful if the node has no secret value. The function should
-store this secret value somewhere so that in the future it may compare
-key secrets and match them to allow access. If a node already has a
-secret value, the function should return that secret value instead
-of the newsecret value. The secret value stored for the node should
-not be overwritten, as this would invalidate existing keys.
-
-Aside from the secret value, the function should retun a descriptive
-name for the node and the owner name. The return values are all
-encoded in the key that will be given to the player in replacement
-for the wielded skeleton key.
-
-if `nil` is returned, it is assumed that the wielder did not have
-permissions to create a key for this node, and no key is created.

minetest.conf

@@ -0,0 +1,3 @@
+# Enable jungles on new worlds, disable biome blend and mud flow (faster, looks better).
+mgv6_spflags = jungles, nobiomeblend, nomudflow
+disable_fire = true

minetest.conf.example

@@ -24,9 +24,6 @@
 # 'permanent flame' nodes will remain with either setting.
 #enable_fire = true
 
-# Enable flame sound.
-#flame_sound = true
-
 # Whether the stuff in initial_stuff should be given to new players
 #give_initial_stuff = false
 #initial_stuff = default:pick_steel,default:axe_steel,default:shovel_steel,default:torch 99,default:cobble 99

mods/_misc_init/init.lua

@@ -0,0 +1,9 @@
+----------------------------------------
+-- Server Misc Mod - pre-default init --
+----------------------------------------
+
+local cwd = minetest.get_modpath(minetest.get_current_modname())
+
+-- Inventory refill function override
+-- see https://github.com/MinetestForFun/server-minetestforfun/issues/462
+dofile(cwd.."/inventory_rotate_node.lua")

mods/_misc_init/inventory_rotate_node.lua

@@ -0,0 +1,22 @@
+--rewrite function minetest.rotate_node(itemstack, placer, pointed_thing) to refill inventory
+local old_rotate_node = minetest.rotate_node
+function minetest.rotate_node(itemstack, placer, pointed_thing)
+	local stack_name = itemstack:get_name()
+	local ret = old_rotate_node(itemstack, placer, pointed_thing)
+	if  ret:get_count() == 0 and not minetest.setting_getbool("creative_mode") then
+		local index = placer:get_wield_index()
+		local inv = placer:get_inventory()
+		if inv:get_list("main") then
+			for i, stack in ipairs(inv:get_list("main")) do
+				if i ~= index and stack:get_name() == stack_name then
+					ret:add_item(stack)
+					stack:clear()
+					inv:set_stack("main", i, stack)
+					minetest.log("action", "Inventory Tweaks: refilled stack("..stack_name..") of "  .. placer:get_player_name())
+					break
+				end
+			end
+		end
+	end
+	return ret
+end

mods/beds/README.txt

@@ -1,26 +1,30 @@
 Minetest Game mod: beds
 =======================
-See license.txt for license information.
+by BlockMen (c) 2014-2015
 
-Authors of source code
-----------------------
-Originally by BlockMen (MIT)
-Various Minetest developers and contributors (MIT)
+Version: 1.1.1
 
-Authors of media (textures)
----------------------------
-BlockMen (CC BY-SA 3.0)
+About
+~~~~~
+This mod adds a bed to Minetest which allows to skip the night. To sleep rightclick the bed, if playing 
+in singleplayer mode the night gets skipped imideatly. If playing on server you get shown how many other
+players are in bed too. If all players are sleeping the night gets skipped aswell. Also the night skip can be forced
+if more than 50% of the players are lying in bed and use this option.
 
-This mod adds a bed to Minetest which allows to skip the night.
-To sleep, rightclick the bed. If playing in singleplayer mode the night gets skipped
-immediately. If playing multiplayer you get shown how many other players are in bed too,
-if all players are sleeping the night gets skipped. The night skip can be forced if more
-than 50% of the players are lying in bed and use this option.
+Another feature is a controled respawning. If you have slept in bed (not just lying in it) your respawn point
+is set to the beds location and you will respawn there after death.
+You can disable the respawn at beds by setting "enable_bed_respawn = false" in minetest.conf
+You can also disable the night skip feature by setting "enable_bed_night_skip = false" in minetest.conf or by using
+the /set command ingame.
 
-Another feature is a controlled respawning. If you have slept in bed (not just lying in
-it) your respawn point is set to the beds location and you will respawn there after
-death.
-You can disable the respawn at beds by setting "enable_bed_respawn = false" in
-minetest.conf.
-You can disable the night skip feature by setting "enable_bed_night_skip = false" in
-minetest.conf or by using the /set command in-game.
+
+License of source code, textures: WTFPL
+---------------------------------------
+(c) Copyright BlockMen (2014-2015)
+
+
+This program is free software. It comes without any warranty, to
+the extent permitted by applicable law. You can redistribute it
+and/or modify it under the terms of the Do What The Fuck You Want
+To Public License, Version 2, as published by Sam Hocevar. See
+http://sam.zoy.org/wtfpl/COPYING for more details.

mods/beds/api.lua

@@ -1,27 +1,3 @@
-
-local reverse = true
-
-local function destruct_bed(pos, n)
-	local node = minetest.get_node(pos)
-	local other
-
-	if n == 2 then
-		local dir = minetest.facedir_to_dir(node.param2)
-		other = vector.subtract(pos, dir)
-	elseif n == 1 then
-		local dir = minetest.facedir_to_dir(node.param2)
-		other = vector.add(pos, dir)
-	end
-
-	if reverse then
-		reverse = not reverse
-		minetest.remove_node(other)
-		minetest.check_for_falling(other)
-	else
-		reverse = not reverse
-	end
-end
-
 function beds.register_bed(name, def)
 	minetest.register_node(name .. "_bottom", {
 		description = def.description,
@@ -33,7 +9,7 @@ function beds.register_bed(name, def)
 		paramtype2 = "facedir",
 		is_ground_content = false,
 		stack_max = 1,
-		groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, bed = 1},
+		groups = {snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, bed = 1},
 		sounds = default.node_sound_wood_defaults(),
 		node_box = {
 			type = "fixed",
@@ -43,59 +19,42 @@ function beds.register_bed(name, def)
 			type = "fixed",
 			fixed = def.selectionbox,
 		},
-
-		on_place = function(itemstack, placer, pointed_thing)
-			local under = pointed_thing.under
-			local pos
-			if minetest.registered_items[minetest.get_node(under).name].buildable_to then
-				pos = under
-			else
-				pos = pointed_thing.above
+		after_place_node = function(pos, placer, itemstack)
+			local n = minetest.get_node_or_nil(pos)
+			if not n or not n.param2 then
+				minetest.remove_node(pos)
+				return true
 			end
-
-			if minetest.is_protected(pos, placer:get_player_name()) and
-					not minetest.check_player_privs(placer, "protection_bypass") then
-				minetest.record_protection_violation(pos, placer:get_player_name())
-				return itemstack
+			local dir = minetest.facedir_to_dir(n.param2)
+			local p = vector.add(pos, dir)
+			local n2 = minetest.get_node_or_nil(p)
+			local def = n2 and minetest.registered_items[n2.name]
+			if not def or not def.buildable_to then
+				minetest.remove_node(pos)
+				return true
 			end
-
-			local node_def = minetest.registered_nodes[minetest.get_node(pos).name]
-			if not node_def or not node_def.buildable_to then
-				return itemstack
-			end
-
-			local dir = minetest.dir_to_facedir(placer:get_look_dir())
-			local botpos = vector.add(pos, minetest.facedir_to_dir(dir))
-
-			if minetest.is_protected(botpos, placer:get_player_name()) and
-					not minetest.check_player_privs(placer, "protection_bypass") then
-				minetest.record_protection_violation(botpos, placer:get_player_name())
-				return itemstack
-			end
-
-			local botdef = minetest.registered_nodes[minetest.get_node(botpos).name]
-			if not botdef or not botdef.buildable_to then
-				return itemstack
-			end
-
-			minetest.set_node(pos, {name = name .. "_bottom", param2 = dir})
-			minetest.set_node(botpos, {name = name .. "_top", param2 = dir})
-
-			if not minetest.setting_getbool("creative_mode") then
-				itemstack:take_item()
-			end
-			return itemstack
+			minetest.set_node(p, {name = n.name:gsub("%_bottom", "_top"), param2 = n.param2})
+			return false
 		end,
-
 		on_destruct = function(pos)
-			destruct_bed(pos, 1)
+			local n = minetest.get_node_or_nil(pos)
+			if not n then return end
+			local dir = minetest.facedir_to_dir(n.param2)
+			local p = vector.add(pos, dir)
+			local n2 = minetest.get_node(p)
+			if minetest.get_item_group(n2.name, "bed") == 2 and n.param2 == n2.param2 then
+				minetest.remove_node(p)
+			end
 		end,
-
-		on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
+		after_dig_node = function(pos, oldnode, oldmetadata, digger)
+			local name = digger:get_player_name()
+			if not name or name == "" then return end
+			beds.spawn[name] = nil
+			beds.save_spawns()
+		end,
+		on_rightclick = function(pos, node, clicker)
 			beds.on_rightclick(pos, clicker)
-			return itemstack
 		end,
-
 		on_rotate = function(pos, node, user, mode, new_param2)
 			local dir = minetest.facedir_to_dir(node.param2)
 			local p = vector.add(pos, dir)
@@ -113,8 +72,8 @@ function beds.register_bed(name, def)
 			end
 			local newp = vector.add(pos, minetest.facedir_to_dir(new_param2))
 			local node3 = minetest.get_node_or_nil(newp)
-			local node_def = node3 and minetest.registered_nodes[node3.name]
-			if not node_def or not node_def.buildable_to then
+			local def = node3 and minetest.registered_nodes[node3.name]
+			if not def or not def.buildable_to then
 				return false
 			end
 			if minetest.is_protected(newp, user:get_player_name()) then
@@ -122,10 +81,9 @@ function beds.register_bed(name, def)
 				return false
 			end
 			node.param2 = new_param2
-			-- do not remove_node here - it will trigger destroy_bed()
-			minetest.set_node(p, {name = "air"})
-			minetest.set_node(pos, node)
-			minetest.set_node(newp, {name = name .. "_top", param2 = new_param2})
+			minetest.swap_node(pos, node)
+			minetest.remove_node(p)
+			minetest.set_node(newp, {name = node.name:gsub("%_bottom", "_top"), param2 = new_param2})
 			return true
 		end,
 	})
@@ -137,20 +95,17 @@ function beds.register_bed(name, def)
 		paramtype2 = "facedir",
 		is_ground_content = false,
 		pointable = false,
-		groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, bed = 2},
+		groups = {snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, bed = 2},
 		sounds = default.node_sound_wood_defaults(),
-		drop = name .. "_bottom",
 		node_box = {
 			type = "fixed",
 			fixed = def.nodebox.top,
 		},
-		on_destruct = function(pos)
-			destruct_bed(pos, 2)
-		end,
 	})
 
 	minetest.register_alias(name, name .. "_bottom")
 
+	-- register recipe
 	minetest.register_craft({
 		output = name,
 		recipe = def.recipe

mods/beds/beds.lua

@@ -1,37 +1,36 @@
--- Fancy shaped bed
-
-beds.register_bed("beds:fancy_bed", {
-	description = "Fancy Bed",
-	inventory_image = "beds_bed_fancy.png",
-	wield_image = "beds_bed_fancy.png",
-	tiles = {
-		bottom = {
-			"beds_bed_top1.png",
+for _, colour in pairs({"red", "white", "black", "blue", "green"}) do-- fancy shaped bed
+	beds.register_bed("beds:fancy_bed_" .. colour, {
+		description = "Fancy Bed (" .. colour .. ")",
+		inventory_image = "beds_bed_fancy_" .. colour .. ".png",
+		wield_image = "beds_bed_fancy_" .. colour .. ".png",
+		tiles = {
+		    bottom = {
+			"beds_bed_top1_" .. colour .. ".png",
 			"default_wood.png",
-			"beds_bed_side1.png",
-			"beds_bed_side1.png^[transformFX",
+			"beds_bed_side1_" .. colour .. ".png",
+			"beds_bed_side1_" .. colour .. ".png^[transformFX",
 			"default_wood.png",
-			"beds_bed_foot.png",
-		},
-		top = {
-			"beds_bed_top2.png",
+			"beds_bed_foot_" .. colour .. ".png",
+		    },
+		    top = {
+			"beds_bed_top2_" .. colour .. ".png",
 			"default_wood.png",
-			"beds_bed_side2.png",
-			"beds_bed_side2.png^[transformFX",
+			"beds_bed_side2_" .. colour .. ".png",
+			"beds_bed_side2_" .. colour .. ".png^[transformFX",
 			"beds_bed_head.png",
 			"default_wood.png",
-		}
-	},
-	nodebox = {
-		bottom = {
+		    }
+		},
+		nodebox = {
+		    bottom = {
 			{-0.5, -0.5, -0.5, -0.375, -0.065, -0.4375},
 			{0.375, -0.5, -0.5, 0.5, -0.065, -0.4375},
 			{-0.5, -0.375, -0.5, 0.5, -0.125, -0.4375},
 			{-0.5, -0.375, -0.5, -0.4375, -0.125, 0.5},
 			{0.4375, -0.375, -0.5, 0.5, -0.125, 0.5},
 			{-0.4375, -0.3125, -0.4375, 0.4375, -0.0625, 0.5},
-		},
-		top = {
+		      },
+		      top = {
 			{-0.5, -0.5, 0.4375, -0.375, 0.1875, 0.5},
 			{0.375, -0.5, 0.4375, 0.5, 0.1875, 0.5},
 			{-0.5, 0, 0.4375, 0.5, 0.125, 0.5},
@@ -39,66 +38,55 @@ beds.register_bed("beds:fancy_bed", {
 			{-0.5, -0.375, -0.5, -0.4375, -0.125, 0.5},
 			{0.4375, -0.375, -0.5, 0.5, -0.125, 0.5},
 			{-0.4375, -0.3125, -0.5, 0.4375, -0.0625, 0.4375},
-		}
-	},
-	selectionbox = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5},
-	recipe = {
-		{"", "", "group:stick"},
-		{"wool:red", "wool:red", "wool:white"},
-		{"group:wood", "group:wood", "group:wood"},
-	},
-})
-
--- Simple shaped bed
-
-beds.register_bed("beds:bed", {
-	description = "Simple Bed",
-	inventory_image = "beds_bed.png",
-	wield_image = "beds_bed.png",
-	tiles = {
-		bottom = {
-			"beds_bed_top_bottom.png^[transformR90",
-			"default_wood.png",
-			"beds_bed_side_bottom_r.png",
-			"beds_bed_side_bottom_r.png^[transformfx",
-			"beds_transparent.png",
-			"beds_bed_side_bottom.png"
+		      }
 		},
-		top = {
-			"beds_bed_top_top.png^[transformR90",
+		selectionbox = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5},
+		recipe = {
+			{"", "", "group:stick"},
+			{"wool:" .. colour, "wool:" .. colour, "wool:white"},
+			{"group:wood", "group:wood", "group:wood"},
+		},
+	})
+
+	-- simple shaped bed
+	beds.register_bed("beds:bed_" .. colour, {
+		description = "Simple Bed (" .. colour .. ")",
+		inventory_image = "beds_bed_" .. colour .. ".png",
+		wield_image = "beds_bed_" .. colour .. ".png",
+		tiles = {
+		    bottom = {
+			"beds_bed_top_bottom_" .. colour .. ".png^[transformR90",
 			"default_wood.png",
-			"beds_bed_side_top_r.png",
-			"beds_bed_side_top_r.png^[transformfx",
+			"beds_bed_side_bottom_r_" .. colour .. ".png",
+			"beds_bed_side_bottom_r_" .. colour .. ".png^[transformfx",
+			"beds_transparent.png",
+			"beds_bed_side_bottom_" .. colour .. ".png"
+		    },
+		    top = {
+			"beds_bed_top_top_" .. colour .. ".png^[transformR90",
+			"default_wood.png",
+			"beds_bed_side_top_r_" .. colour .. ".png",
+			"beds_bed_side_top_r_" .. colour .. ".png^[transformfx",
 			"beds_bed_side_top.png",
 			"beds_transparent.png",
-		}
-	},
-	nodebox = {
-		bottom = {-0.5, -0.5, -0.5, 0.5, 0.06, 0.5},
-		top = {-0.5, -0.5, -0.5, 0.5, 0.06, 0.5},
-	},
-	selectionbox = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5},
-	recipe = {
-		{"wool:red", "wool:red", "wool:white"},
-		{"group:wood", "group:wood", "group:wood"}
-	},
-})
+		    }
+		},
+		nodebox = {
+		    bottom = {-0.5, -0.5, -0.5, 0.5, 0.06, 0.5},
+		    top = {-0.5, -0.5, -0.5, 0.5, 0.06, 0.5},
+		},
+		selectionbox = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5},
+		recipe = {
+			{"wool:" .. colour, "wool:" .. colour, "wool:white"},
+			{"group:wood", "group:wood", "group:wood"}
+		},
+	
+	})
+end
 
--- Aliases for PilzAdam's beds mod
-
-minetest.register_alias("beds:bed_bottom_red", "beds:bed_bottom")
-minetest.register_alias("beds:bed_top_red", "beds:bed_top")
-
--- Fuel
-
-minetest.register_craft({
-	type = "fuel",
-	recipe = "beds:fancy_bed_bottom",
-	burntime = 13,
-})
-
-minetest.register_craft({
-	type = "fuel",
-	recipe = "beds:bed_bottom",
-	burntime = 12,
-})
+minetest.register_alias("beds:bed", "beds:bed_red")
+minetest.register_alias("beds:fancy_bed", "beds:fancy_bed_red")
+minetest.register_alias("beds:bed_bottom", "beds:bed_red_bottom")
+minetest.register_alias("beds:bed_top", "beds:bed_red_top")
+minetest.register_alias("beds:fancy_bed_top", "beds:fancy_bed_red_top")
+minetest.register_alias("beds:fancy_bed_bottom", "beds:fancy_bed_red_bottom")

mods/beds/depends.txt

@@ -1,2 +1,3 @@
 default
 wool
+areas

mods/beds/functions.lua

@@ -6,14 +6,15 @@ if enable_respawn == nil then
 	enable_respawn = true
 end
 
--- Helper functions
+
+-- helper functions
 
 local function get_look_yaw(pos)
 	local n = minetest.get_node(pos)
 	if n.param2 == 1 then
-		return pi / 2, n.param2
+		return pi/2, n.param2
 	elseif n.param2 == 3 then
-		return -pi / 2, n.param2
+		return -pi/2, n.param2
 	elseif n.param2 == 0 then
 		return pi, n.param2
 	else
@@ -69,8 +70,8 @@ local function lay_down(player, pos, bed_pos, state, skip)
 		end
 
 		-- physics, eye_offset, etc
-		player:set_eye_offset({x = 0, y = 0, z = 0}, {x = 0, y = 0, z = 0})
-		player:set_look_horizontal(math.random(1, 180) / 100)
+		player:set_eye_offset({x=0,y=0,z=0}, {x=0,y=0,z=0})
+		player:set_look_yaw(math.random(1, 180)/100)
 		default.player_attached[name] = false
 		player:set_physics_override(1, 1, 1)
 		hud_flags.wielditem = true
@@ -83,11 +84,11 @@ local function lay_down(player, pos, bed_pos, state, skip)
 		player_in_bed = player_in_bed + 1
 
 		-- physics, eye_offset, etc
-		player:set_eye_offset({x = 0, y = -13, z = 0}, {x = 0, y = 0, z = 0})
+		player:set_eye_offset({x=0,y=-13,z=0}, {x=0,y=0,z=0})
 		local yaw, param2 = get_look_yaw(bed_pos)
-		player:set_look_horizontal(yaw)
+		player:set_look_yaw(yaw)
 		local dir = minetest.facedir_to_dir(param2)
-		local p = {x = bed_pos.x + dir.x / 2, y = bed_pos.y, z = bed_pos.z + dir.z / 2}
+		local p = {x=bed_pos.x+dir.x/2,y=bed_pos.y,z=bed_pos.z+dir.z/2}
 		player:set_physics_override(0, 0, 0)
 		player:setpos(p)
 		default.player_attached[name] = true
@@ -100,16 +101,18 @@ end
 
 local function update_formspecs(finished)
 	local ges = #minetest.get_connected_players()
-	local form_n
-	local is_majority = (ges / 2) < player_in_bed
+	local form_n = ""
+	local is_majority = (ges/2) < player_in_bed
 
 	if finished then
-		form_n = beds.formspec .. "label[2.7,11; Good morning.]"
+		form_n = beds.formspec ..
+			"label[2.7,11; Good morning.]"
 	else
-		form_n = beds.formspec .. "label[2.2,11;" .. tostring(player_in_bed) ..
-			" of " .. tostring(ges) .. " players are in bed]"
+		form_n = beds.formspec ..
+			"label[2.2,11;"..tostring(player_in_bed).." of "..tostring(ges).." players are in bed]"
 		if is_majority and is_night_skip_enabled() then
-			form_n = form_n .. "button_exit[2,8;4,0.75;force;Force night skip]"
+			form_n = form_n ..
+				"button_exit[2,8;4,0.75;force;Force night skip]"
 		end
 	end
 
@@ -119,10 +122,10 @@ local function update_formspecs(finished)
 end
 
 
--- Public functions
+-- public functions
 
 function beds.kick_players()
-	for name, _ in pairs(beds.player) do
+	for name,_ in pairs(beds.player) do
 		local player = minetest.get_player_by_name(name)
 		lay_down(player, nil, nil, false)
 	end
@@ -130,6 +133,7 @@ end
 
 function beds.skip_night()
 	minetest.set_timeofday(0.23)
+	beds.set_spawns()
 end
 
 function beds.on_rightclick(pos, player)
@@ -148,7 +152,6 @@ function beds.on_rightclick(pos, player)
 	-- move to bed
 	if not beds.player[name] then
 		lay_down(player, ppos, pos)
-		beds.set_spawns() -- save respawn positions when entering bed
 	else
 		lay_down(player, nil, nil, false)
 	end
@@ -172,20 +175,68 @@ function beds.on_rightclick(pos, player)
 end
 
 
--- Callbacks
--- Only register respawn callback if respawn enabled
-if enable_respawn then
-	-- respawn player at bed if enabled and valid position is found
-	minetest.register_on_respawnplayer(function(player)
-		local name = player:get_player_name()
-		local pos = beds.spawn[name]
+-- callbacks
+--[[ --MFF (Crabman) It's useless to read each join player, read only once at load. function moved/called in spawn.lua
+minetest.register_on_joinplayer(function(player)
+	beds.read_spawns()
+end)
+--]]
+
+
+local dead_players = {}
+local have_areas_mod = false
+if (minetest.get_modpath("areas") ~= nil) and areas.getSpawn then
+	have_areas_mod = true
+end
+
+
+local function teleport_player(player, clear)
+	local name = player:get_player_name()
+	if not name or name == "" then return false end
+	if have_areas_mod and dead_players[name] ~= nil then
+		local pos = areas:getSpawn(dead_players[name])
+		if clear then
+			dead_players[name] = nil
+		end
 		if pos then
 			player:setpos(pos)
 			return true
 		end
-	end)
+	end
+	if not enable_respawn then
+		return false
+	end
+	local name = player:get_player_name()
+	local pos = beds.spawn[name] or nil
+	if pos then
+		player:setpos(pos)
+		return true
+	end
+	--if not areas or bed spawnpoint, tp to the spawn
+	local spawn = minetest.string_to_pos(minetest.setting_get("static_spawnpoint") or "0,0,0")
+	player:setpos(spawn)
+	return false
 end
 
+
+minetest.register_on_dieplayer(function(player)
+	local name = player:get_player_name()
+	if not name or name == "" then return end
+	if have_areas_mod then
+		local pos = player:getpos()
+		if pos then
+			dead_players[name] = pos
+		end
+	end
+	minetest.after(0.20, teleport_player, player) -- tp after all others on_dieplayer callback otherwise their pos is wrong
+end)
+
+-- respawn player at bed if enabled and valid position is found
+minetest.register_on_respawnplayer(function(player)
+	return teleport_player(player, true)
+end)
+
+
 minetest.register_on_leaveplayer(function(player)
 	local name = player:get_player_name()
 	lay_down(player, nil, nil, false, true)

mods/beds/init.lua

@@ -3,15 +3,14 @@ beds.player = {}
 beds.pos = {}
 beds.spawn = {}
 
-beds.formspec = "size[8,15;true]" ..
-	"bgcolor[#080808BB; true]" ..
-	"button_exit[2,12;4,0.75;leave;Leave Bed]"
+beds.formspec = "size[8,15;true]"..
+		"bgcolor[#080808BB; true]"..
+		"button_exit[2,12;4,0.75;leave;Leave Bed]"
 
 local modpath = minetest.get_modpath("beds")
 
--- Load files
-
-dofile(modpath .. "/functions.lua")
-dofile(modpath .. "/api.lua")
-dofile(modpath .. "/beds.lua")
-dofile(modpath .. "/spawns.lua")
+-- load files
+dofile(modpath.."/functions.lua")
+dofile(modpath.."/api.lua")
+dofile(modpath.."/beds.lua")
+dofile(modpath.."/spawns.lua")

mods/beds/license.txt

@@ -1,60 +0,0 @@
-License of source code
-----------------------
-
-The MIT License (MIT)
-Copyright (C) 2014-2016 BlockMen
-Copyright (C) 2014-2016 Various Minetest developers and contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this
-software and associated documentation files (the "Software"), to deal in the Software
-without restriction, including without limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of the Software, and to permit
-persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
-FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
-For more details:
-https://opensource.org/licenses/MIT
-
-
-Licenses of media (textures)
-----------------------------
-
-Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
-Copyright (C) 2014-2016 BlockMen
-
-You are free to:
-Share — copy and redistribute the material in any medium or format.
-Adapt — remix, transform, and build upon the material for any purpose, even commercially.
-The licensor cannot revoke these freedoms as long as you follow the license terms.
-
-Under the following terms:
-
-Attribution — You must give appropriate credit, provide a link to the license, and
-indicate if changes were made. You may do so in any reasonable manner, but not in any way
-that suggests the licensor endorses you or your use.
-
-ShareAlike — If you remix, transform, or build upon the material, you must distribute
-your contributions under the same license as the original.
-
-No additional restrictions — You may not apply legal terms or technological measures that
-legally restrict others from doing anything the license permits.
-
-Notices:
-
-You do not have to comply with the license for elements of the material in the public
-domain or where your use is permitted by an applicable exception or limitation.
-No warranties are given. The license may not give you all of the permissions necessary
-for your intended use. For example, other rights such as publicity, privacy, or moral
-rights may limit how you use the material.
-
-For more details:
-http://creativecommons.org/licenses/by-sa/3.0/

mods/beds/models/fancy_bed.obj

@@ -0,0 +1,160 @@
+# Blender v2.69 (sub 0) OBJ File: ''
+# www.blender.org
+mtllib fancy_bed.mtl
+o mattress_Mattress_nodebox-6_none.001_fancy_bed.png.001
+v 0.437500 -0.312500 -0.437501
+v 0.437500 -0.062500 -0.437501
+v 0.437500 -0.062500 1.437499
+v 0.437500 -0.312500 1.437499
+v -0.437500 -0.312500 -0.437501
+v -0.437500 -0.312500 1.437499
+v -0.437500 -0.062500 1.437499
+v -0.437500 -0.062500 -0.437501
+v 0.437500 -0.176793 -0.437501
+v -0.437500 -0.176793 -0.437501
+vt 0.000171 0.499972
+vt 0.000161 0.000182
+vt 0.999791 0.000253
+vt 0.999873 0.500022
+vt 0.749576 0.000208
+vt 0.749876 0.499854
+vt 0.999848 0.999750
+vt 0.000152 0.999750
+vt 0.749276 0.130648
+vt 0.000112 0.130648
+g mattress_Mattress_nodebox-6_none.001_fancy_bed.png.001_none.001_fancy_bed.png.001
+usemtl none.001_fancy_bed.png.001
+s off
+f 1/1 2/2 3/3 4/4
+f 5/2 6/3 7/4 8/1
+f 4/5 3/2 7/1 6/6
+f 1/1 4/4 6/7 5/8
+f 2/1 8/2 7/3 3/4
+f 8/2 2/5 9/9 10/10
+o wood_structure_Wood_structure_nodebox-4.001_none.002
+v 0.374999 -0.375000 1.437499
+v 0.374999 -0.125000 1.437499
+v 0.374999 -0.125000 1.499999
+v 0.374999 -0.375000 1.499999
+v -0.374999 -0.375000 1.437499
+v -0.374999 -0.375000 1.499999
+v -0.374999 -0.125000 1.499999
+v -0.374999 -0.125000 1.437499
+v -0.375000 -0.500000 1.437499
+v -0.375000 0.187500 1.437499
+v -0.375000 0.187500 1.499999
+v -0.375000 -0.500000 1.499999
+v -0.500000 -0.500000 1.437499
+v -0.500000 -0.500000 1.499999
+v -0.500000 0.187500 1.499999
+v -0.500000 0.187500 1.437499
+v -0.437500 -0.375000 -0.437501
+v -0.437500 -0.125000 -0.437501
+v -0.437500 -0.125000 1.437498
+v -0.437500 -0.375000 1.437498
+v -0.500000 -0.375000 -0.437501
+v -0.500000 -0.375000 1.437498
+v -0.500000 -0.125000 1.437498
+v -0.500000 -0.125000 -0.437501
+v 0.375001 -0.000000 1.437499
+v 0.375001 0.125000 1.437499
+v 0.375001 0.125000 1.499999
+v 0.375001 -0.000000 1.499999
+v -0.375001 -0.000000 1.437499
+v -0.375001 -0.000000 1.499999
+v -0.375001 0.125000 1.499999
+v -0.375001 0.125000 1.437499
+v 0.500000 -0.500000 1.437499
+v 0.500000 0.187500 1.437499
+v 0.500000 0.187500 1.499999
+v 0.500000 -0.500000 1.499999
+v 0.375000 -0.500000 1.437499
+v 0.375000 -0.500000 1.499999
+v 0.375000 0.187500 1.499999
+v 0.375000 0.187500 1.437499
+v 0.500000 -0.375000 -0.437501
+v 0.500000 -0.125000 -0.437501
+v 0.500000 -0.125000 1.437499
+v 0.500000 -0.375000 1.437499
+v 0.437500 -0.375000 -0.437501
+v 0.437500 -0.375000 1.437499
+v 0.437500 -0.125000 1.437499
+v 0.437500 -0.125000 -0.437501
+v -0.375000 -0.500000 -0.500000
+v -0.375000 -0.065000 -0.500000
+v -0.375000 -0.065000 -0.437500
+v -0.375000 -0.500000 -0.437500
+v -0.500000 -0.500000 -0.500000
+v -0.500000 -0.500000 -0.437500
+v -0.500000 -0.065000 -0.437500
+v -0.500000 -0.065000 -0.500000
+v 0.375006 -0.375000 -0.500000
+v 0.375006 -0.125000 -0.500000
+v 0.375006 -0.125000 -0.437500
+v 0.375006 -0.375000 -0.437500
+v -0.375006 -0.375000 -0.500000
+v -0.375006 -0.375000 -0.437500
+v -0.375006 -0.125000 -0.437500
+v -0.375006 -0.125000 -0.500000
+v 0.500000 -0.500000 -0.500000
+v 0.500000 -0.065000 -0.500000
+v 0.500000 -0.065000 -0.437500
+v 0.500000 -0.500000 -0.437500
+v 0.375000 -0.500000 -0.500000
+v 0.375000 -0.500000 -0.437500
+v 0.375000 -0.065000 -0.437500
+v 0.375000 -0.065000 -0.500000
+vt 0.377610 0.378205
+vt 0.622484 0.378175
+vt 0.622515 0.623120
+vt 0.377671 0.623151
+g wood_structure_Wood_structure_nodebox-4.001_none.002_none.002
+usemtl none.002
+s off
+f 59/11 60/12 61/13 62/14
+f 63/14 64/11 65/12 66/13
+f 59/11 63/14 66/13 60/12
+f 62/14 61/13 65/12 64/11
+f 59/11 62/14 64/13 63/12
+f 60/12 66/11 65/14 61/13
+f 67/11 71/12 74/13 68/14
+f 70/14 69/11 73/12 72/13
+f 67/11 70/12 72/13 71/14
+f 68/11 74/12 73/13 69/14
+f 75/11 76/12 77/13 78/14
+f 79/14 80/11 81/12 82/13
+f 75/14 79/11 82/12 76/13
+f 78/11 77/12 81/13 80/14
+f 75/11 78/12 80/13 79/14
+f 76/11 82/12 81/13 77/14
+g wood_structure_Wood_structure_nodebox-4.001_none.002_none.003
+usemtl none.003
+f 15/11 16/12 17/13 18/14
+f 11/13 15/14 18/11 12/12
+f 14/14 13/11 17/12 16/13
+f 11/14 14/11 16/12 15/13
+f 12/11 18/12 17/13 13/14
+f 19/11 20/12 21/13 22/14
+f 23/14 24/11 25/12 26/13
+f 19/14 23/11 26/12 20/13
+f 22/11 21/12 25/13 24/14
+f 19/11 22/12 24/13 23/14
+f 20/11 26/12 25/13 21/14
+f 27/14 28/11 29/12 30/13
+f 31/11 32/12 33/13 34/14
+f 27/11 30/12 32/13 31/14
+f 28/14 34/11 33/12 29/13
+f 35/11 39/12 42/13 36/14
+f 38/14 37/11 41/12 40/13
+f 35/14 38/11 40/12 39/13
+f 36/11 42/12 41/13 37/14
+f 43/11 44/12 45/13 46/14
+f 47/14 48/11 49/12 50/13
+f 43/14 47/11 50/12 44/13
+f 46/11 45/12 49/13 48/14
+f 43/11 46/12 48/13 47/14
+f 44/11 50/12 49/13 45/14
+f 51/14 52/11 53/12 54/13
+f 55/13 56/14 57/11 58/12
+f 51/11 54/12 56/13 55/14
+f 52/14 58/11 57/12 53/13

mods/beds/models/simple_bed.obj

@@ -0,0 +1,32 @@
+# Blender v2.69 (sub 0) OBJ File: ''
+# www.blender.org
+mtllib simple_bed.mtl
+o Simple_Bed
+v 0.500000 -0.500000 -0.500000
+v 0.500000 0.060000 -0.500000
+v 0.500000 0.060000 1.500000
+v 0.500000 -0.500000 1.500000
+v -0.500000 -0.500000 -0.500000
+v -0.500000 -0.500000 1.500000
+v -0.500000 0.060000 1.500000
+v -0.500000 0.060000 -0.500000
+vt 0.000112 0.780442
+vt 0.000110 0.999969
+vt 0.780324 0.999889
+vt 0.780377 0.780471
+vt 0.780636 0.390284
+vt 0.999906 0.780382
+vt 0.999906 0.390284
+vt 0.780636 0.000047
+vt 0.999906 0.000094
+vt 0.390235 0.780320
+vt 0.390235 0.000071
+vt 0.000142 0.000142
+usemtl none.002
+s off
+f 1/1 2/2 3/3 4/4
+f 5/1 6/4 7/3 8/2
+f 1/5 5/4 8/6 2/7
+f 4/8 3/9 7/7 6/5
+f 1/8 4/4 6/10 5/11
+f 2/11 8/12 7/1 3/10

mods/beds/spawns.lua

@@ -18,8 +18,8 @@ function beds.read_spawns()
 		repeat
 			local x = input:read("*n")
 			if x == nil then
-				break
-			end
+            			break
+            		end
 			local y = input:read("*n")
 			local z = input:read("*n")
 			local name = input:read("*l")
@@ -32,21 +32,19 @@ function beds.read_spawns()
 		beds.save_spawns()
 		os.rename(file, file .. ".backup")
 		file = org_file
+	else
+		spawns = {}
 	end
 end
 
-beds.read_spawns()
-
 function beds.save_spawns()
 	if not beds.spawn then
 		return
 	end
-	local data = {}
 	local output = io.open(org_file, "w")
-	for k, v in pairs(beds.spawn) do
-		table.insert(data, string.format("%.1f %.1f %.1f %s\n", v.x, v.y, v.z, k))
+	for i, v in pairs(beds.spawn) do
+		output:write(v.x.." "..v.y.." "..v.z.." "..i.."\n")
 	end
-	output:write(table.concat(data))
 	io.close(output)
 end
 
@@ -54,10 +52,9 @@ function beds.set_spawns()
 	for name,_ in pairs(beds.player) do
 		local player = minetest.get_player_by_name(name)
 		local p = player:getpos()
-		-- but don't change spawn location if borrowing a bed
-		if not minetest.is_protected(p, name) then
-			beds.spawn[name] = p
-		end
+		beds.spawn[name] = p
 	end
 	beds.save_spawns()
 end
+
+beds.read_spawns()