From 1a2c50087389dd86952ae6a8d09538ff500ef650 Mon Sep 17 00:00:00 2001
From: kay27 <kay27@bk.ru>
Date: Wed, 20 Jan 2021 01:46:52 +0400
Subject: [PATCH] Restore missing 'died formspec' after player exploded being
 in the bed

---
 mods/CORE/mcl_explosions/init.lua | 34 ++++++++++++++++++++++---------
 mods/ITEMS/mcl_beds/api.lua       |  2 ++
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/mods/CORE/mcl_explosions/init.lua b/mods/CORE/mcl_explosions/init.lua
index cd8a5c0e05..862a2f9dac 100644
--- a/mods/CORE/mcl_explosions/init.lua
+++ b/mods/CORE/mcl_explosions/init.lua
@@ -284,8 +284,18 @@ local function trace_explode(pos, strength, raydirs, radius, drop_chance, fire,
 					impact = 0
 				end
 				local damage = math.floor((impact * impact + impact) * 7 * strength + 1)
+				local source = puncher or obj
+
+				local sleep_formspec_doesnt_close_mt53 = false
 				if obj:is_player() then
 					local name = obj:get_player_name()
+					if mcl_beds then
+						local meta = obj:get_meta()
+						if meta:get_string("mcl_beds:sleeping") == "true" then
+							minetest.close_formspec(name, "") -- ABSOLUTELY NECESSARY FOR MT5.3 -- TODO: REMOVE THIS IN THE FUTURE
+							sleep_formspec_doesnt_close_mt53 = true
+						end
+					end
 					if mod_death_messages then
 						mcl_death_messages.player_damage(obj, S("@1 was caught in an explosion.", name))
 					end
@@ -293,17 +303,21 @@ local function trace_explode(pos, strength, raydirs, radius, drop_chance, fire,
 						armor.last_damage_types[name] = "explosion"
 					end
 				end
-				local source = puncher
-				if not source then
-					source = obj
-				end
-				obj:punch(source, 10, { damage_groups = { full_punch_interval = 1,
-						fleshy = damage, knockback = impact * 20.0 } }, punch_dir)
 
-				if obj:is_player() then
-					obj:add_player_velocity(vector.multiply(punch_dir, impact * 20))
-				elseif ent.tnt_knockback then
-					obj:add_velocity(vector.multiply(punch_dir, impact * 20))
+				if sleep_formspec_doesnt_close_mt53 then
+					minetest.after(0.3, function(obj, damage, impact, punch_dir) -- 0.2 is minimum delay for closing old formspec and open died formspec -- TODO: REMOVE THIS IN THE FUTURE
+						if not obj then return end
+						obj:punch(obj, 10, { damage_groups = { full_punch_interval = 1, fleshy = damage, knockback = impact * 20.0 } }, punch_dir)
+						obj:add_player_velocity(vector.multiply(punch_dir, impact * 20))
+					end, obj, damage, impact, vector.new(punch_dir))
+				else
+					obj:punch(source, 10, { damage_groups = { full_punch_interval = 1, fleshy = damage, knockback = impact * 20.0 } }, punch_dir)
+
+					if obj:is_player() then
+						obj:add_player_velocity(vector.multiply(punch_dir, impact * 20))
+					elseif ent.tnt_knockback then
+						obj:add_velocity(vector.multiply(punch_dir, impact * 20))
+					end
 				end
 			end
 		end
diff --git a/mods/ITEMS/mcl_beds/api.lua b/mods/ITEMS/mcl_beds/api.lua
index af431c529c..c56a11b010 100644
--- a/mods/ITEMS/mcl_beds/api.lua
+++ b/mods/ITEMS/mcl_beds/api.lua
@@ -141,6 +141,8 @@ function mcl_beds.register_bed(name, def)
 
 		after_destruct = destruct_bed,
 
+		on_destruct = kick_player_after_destruct,
+
 		on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 			mcl_beds.on_rightclick(pos, clicker, false)
 			return itemstack