Beds: update based on MTG, no formspec, don't kick players

mods/beds/api.lua

@@ -17,6 +17,8 @@ local function destruct_bed(pos, n)
 		reverse = not reverse
 		minetest.remove_node(other)
 		minetest.check_for_falling(other)
+		beds.remove_spawns_at(pos)
+		beds.remove_spawns_at(other)
 	else
 		reverse = not reverse
 	end
@@ -94,8 +96,7 @@ function beds.register_bed(name, def)
 			minetest.set_node(pos, {name = name .. "_bottom", param2 = dir})
 			minetest.set_node(botpos, {name = name .. "_top", param2 = dir})
 
-			if not (creative and creative.is_enabled_for
-					and creative.is_enabled_for(player_name)) then
+			if not minetest.is_creative_enabled(player_name) then
 				itemstack:take_item()
 			end
 			return itemstack
@@ -155,7 +156,8 @@ 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 = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, bed = 2,
+				not_in_creative_inventory = 1},
 		sounds = def.sounds or default.node_sound_wood_defaults(),
 		drop = name .. "_bottom",
 		node_box = {

mods/beds/functions.lua

@@ -1,13 +1,11 @@
 local pi = math.pi
-local player_in_bed = 0
 local is_sp = minetest.is_singleplayer()
 local enable_respawn = minetest.settings:get_bool("enable_bed_respawn")
-local player_physics = {}
 if enable_respawn == nil then
 	enable_respawn = true
 end
 
--- support for game translation.
+-- support for MT game translation.
 local S = beds.get_translator
 
 -- Helper functions
@@ -62,49 +60,75 @@ local function lay_down(player, pos, bed_pos, state, skip)
 
 	-- stand up
 	if state ~= nil and not state then
-		local p = beds.pos[name] or nil
-		if beds.player[name] ~= nil then
-			beds.player[name] = nil
-			beds.bed_position[name] = nil
-			player_in_bed = player_in_bed - 1
+		if not beds.player[name] then
+			-- player not in bed, do nothing
+			return false
 		end
+		beds.bed_position[name] = nil
 		-- skip here to prevent sending player specific changes (used for leaving players)
 		if skip then
 			return
 		end
-		if p then
-			player:set_pos(p)
-		end
+		player:set_pos(beds.pos[name])
 
 		-- physics, eye_offset, etc
+		local physics_override = beds.player[name].physics_override
+		beds.player[name] = nil
+		player:set_physics_override({
+			speed = physics_override.speed,
+			jump = physics_override.jump,
+			gravity = physics_override.gravity
+		})
 		player:set_eye_offset({x = 0, y = 0, z = 0}, {x = 0, y = 0, z = 0})
-		default.player_attached[name] = false
-		if player_physics[name] then
-			player:set_physics_override(player_physics[name])
-			player_physics[name] = nil
-		else
-			player:set_physics_override(1, 1, 1)
-		end
+		player:set_look_horizontal(math.random(1, 180) / 100)
+		player_api.player_attached[name] = false
 		hud_flags.wielditem = true
 		player_api.set_animation(player, "stand" , 30)
 
 	-- lay down
 	else
-		beds.player[name] = 1
+
+		-- Check if bed is occupied
+		for _, other_pos in pairs(beds.bed_position) do
+			if vector.distance(bed_pos, other_pos) < 0.1 then
+				minetest.chat_send_player(name, S("This bed is already occupied!"))
+				return false
+			end
+		end
+
+		-- Check if player is moving
+		if vector.length(player:get_velocity()) > 0.001 then
+			minetest.chat_send_player(name, S("You have to stop moving before going to bed!"))
+			return false
+		end
+
+		-- Check if player is attached to an object
+		if player:get_attach() then
+			return false
+		end
+
+		if beds.player[name] then
+			-- player already in bed, do nothing
+			return false
+		end
+
 		beds.pos[name] = pos
 		beds.bed_position[name] = bed_pos
-		player_in_bed = player_in_bed + 1
+		beds.player[name] = {physics_override = player:get_physics_override()}
 
-		-- physics, eye_offset, etc
-		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)
 		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}
-		player_physics[name] = player:get_physics_override()
-		player:set_physics_override(0, 0, 0)
+		-- p.y is just above the nodebox height of the 'Simple Bed' (the highest bed),
+		-- to avoid sinking down through the bed.
+		local p = {
+			x = bed_pos.x + dir.x / 2,
+			y = bed_pos.y + 0.07,
+			z = bed_pos.z + dir.z / 2
+		}
+		player:set_physics_override({speed = 0, jump = 0, gravity = 0})
 		player:set_pos(p)
-		default.player_attached[name] = true
+		player_api.player_attached[name] = true
 		hud_flags.wielditem = false
 		player_api.set_animation(player, "lay" , 0)
 	end
@@ -112,6 +136,13 @@ local function lay_down(player, pos, bed_pos, state, skip)
 	player:hud_set_flags(hud_flags)
 end
 
+local function get_player_in_bed_count()
+	local c = 0
+	for _, _ in pairs(beds.player) do
+		c = c + 1
+	end
+	return c
+end
 
 -- Public functions
 
@@ -140,15 +171,12 @@ function beds.on_rightclick(pos, player)
 	end
 
 	-- skip the night and let all players stand up
-	if tod > 0.8 or tod < 0.2 then
-		if check_in_beds() then
-			minetest.after(2, function()
-				if is_night_skip_enabled() then
-					beds.skip_night()
-					beds.kick_players()
-				end
-			end)
-		end
+	if (tod < 0.2 or tod > 0.805) and check_in_beds() then
+		minetest.after(2, function()
+			if is_night_skip_enabled() then
+				beds.skip_night()
+			end
+		end)
 	end
 end
 
@@ -184,8 +212,20 @@ minetest.register_on_leaveplayer(function(player)
 		minetest.after(2, function()
 			if is_night_skip_enabled() then
 				beds.skip_night()
-				beds.kick_players()
 			end
 		end)
 	end
 end)
+
+minetest.register_on_dieplayer(function(player)
+	local name = player:get_player_name()
+	local in_bed = beds.player
+	local pos = player:get_pos()
+	local yaw = get_look_yaw(pos)
+
+	if in_bed[name] then
+		lay_down(player, nil, pos, false)
+		player:set_look_horizontal(yaw)
+		player:set_pos(pos)
+	end
+end)

mods/beds/init.lua

@@ -1,3 +1,5 @@
+-- beds/init.lua
+
 -- Load support for MT game translation.
 local S = minetest.get_translator("beds")
 
@@ -7,11 +9,6 @@ beds.bed_position = {}
 beds.pos = {}
 beds.spawn = {}
 
-beds.formspec = "size[8,11;true]" ..
-	"no_prepend[]" ..
-	"bgcolor[#080808BB;true]" ..
-	"button_exit[2,10;4,0.75;leave;Leave Bed]"
-
 local modpath = minetest.get_modpath("beds")
 
 -- Load files

mods/beds/spawns.lua

@@ -61,3 +61,12 @@ function beds.set_spawns()
 	end
 	beds.save_spawns()
 end
+
+function beds.remove_spawns_at(pos)
+	for name, p in pairs(beds.spawn) do
+		if vector.equals(vector.round(p), pos) then
+			beds.spawn[name] = nil
+		end
+	end
+	beds.save_spawns()
+end