From c78270e70b47fc416f2be2e4116d84e8789e5494 Mon Sep 17 00:00:00 2001
From: kay27 <kay27@bk.ru>
Date: Mon, 27 Jul 2020 00:45:53 +0400
Subject: [PATCH] Bed occupation fix

---
 mods/ITEMS/mcl_beds/functions.lua | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mods/ITEMS/mcl_beds/functions.lua b/mods/ITEMS/mcl_beds/functions.lua
index d73154ee4..abf9683a2 100644
--- a/mods/ITEMS/mcl_beds/functions.lua
+++ b/mods/ITEMS/mcl_beds/functions.lua
@@ -115,13 +115,16 @@ local function lay_down(player, pos, bed_pos, state, skip)
 			mcl_beds.player[name] = nil
 			player_in_bed = player_in_bed - 1
 		end
+		mcl_beds.pos[name] = nil
+		mcl_beds.bed_pos[name] = nil
+		if p then
+			player:set_pos(p)
+		end
+
 		-- skip here to prevent sending player specific changes (used for leaving players)
 		if skip then
 			return false
 		end
-		if p then
-			player:set_pos(p)
-		end
 
 		-- physics, eye_offset, etc
 		player:set_eye_offset({x = 0, y = 0, z = 0}, {x = 0, y = 0, z = 0})
@@ -134,8 +137,6 @@ local function lay_down(player, pos, bed_pos, state, skip)
 		player:get_meta():set_string("mcl_beds:sleeping", "false")
 		hud_flags.wielditem = true
 		mcl_player.player_set_animation(player, "stand" , 30)
-		mcl_beds.pos[name] = nil
-		mcl_beds.bed_pos[name] = nil
 
 	-- lay down
 	else
@@ -360,7 +361,6 @@ end)
 minetest.register_on_leaveplayer(function(player)
 	local name = player:get_player_name()
 	lay_down(player, nil, nil, false, true)
-	mcl_beds.player[name] = nil
 	if check_in_beds() then
 		minetest.after(5, function()
 			if check_in_beds() then