From be3111d133cf01fe266d1e267acdb9f22f98f513 Mon Sep 17 00:00:00 2001
From: JK2K <ikuba03@gmail.com>
Date: Sat, 2 Oct 2021 22:28:24 +0200
Subject: Perform bed checks upon respawn (#5300)

Co-authored-by: Tiger Wang <ziwei.tiger@outlook.com>
---
 Server/Plugins/APIDump/APIDesc.lua | 28 ++++++++++++++++++++++++++--
 Server/Plugins/Core                |  2 +-
 2 files changed, 27 insertions(+), 3 deletions(-)

(limited to 'Server/Plugins')

diff --git a/Server/Plugins/APIDump/APIDesc.lua b/Server/Plugins/APIDump/APIDesc.lua
index 2f1d66648..db06612d9 100644
--- a/Server/Plugins/APIDump/APIDesc.lua
+++ b/Server/Plugins/APIDump/APIDesc.lua
@@ -10463,7 +10463,7 @@ a_Player:OpenWindow(Window);
 							Type = "Vector3i",
 						},
 					},
-					Notes = "Returns the position of the last bed the player has slept in, or the world's spawn if no such position was recorded.",
+					Notes = "Returns the player's respawn position. The player is guaranteed to respawn from death here if {{cPlayer}}:IsRespawnPointForced is true or if a bed exists at this position.",
 				},
 				GetMaxSpeed =
 				{
@@ -10827,6 +10827,15 @@ a_Player:OpenWindow(Window);
 					},
 					Notes = "Returns true if the player's left hand is dominant.",
 				},
+				IsRespawnPointForced = {
+					Returns =
+					{
+						{
+							Type = "boolean",
+						},
+					},
+					Notes = "Returns true if the player unconditionally respawns from death at the position given by {{cPlayer}}:GetLastBedPos with no bed checks performed.",
+				},
 				IsSatiated =
 				{
 					Returns =
@@ -11098,7 +11107,7 @@ a_Player:OpenWindow(Window);
 							IsOptional = true,
 						},
 					},
-					Notes = "Sets the position and world of the player's respawn point, which is also known as the bed position. The player will respawn at this position and world upon death. If the world is not specified, it is set to the player's current world.",
+					Notes = "Sets the position and world of the player's bed. If the world is not specified, it is set to the player's current world. The player will respawn at this position and world upon death if there is a bed there.",
 				},
 				SetCanFly =
 				{
@@ -11298,6 +11307,21 @@ a_Player:OpenWindow(Window);
 					},
 					Notes = "Sets the normal (walking) maximum speed, relative to the game default speed. The default value is 1. Sends the updated speed to the client, if appropriate.",
 				},
+				SetRespawnPosition =
+				{
+					Params =
+					{
+						{
+							Name = "Position",
+							Type = "Vector3i",
+						},
+						{
+							Name = "World",
+							Type = "cWorld",
+						},
+					},
+					Notes = "Sets the position and world of the player's respawn point. The player will respawn at this position and world upon death.",
+				},
 				SetSprint =
 				{
 					Params =
diff --git a/Server/Plugins/Core b/Server/Plugins/Core
index 189690e30..9913cece5 160000
--- a/Server/Plugins/Core
+++ b/Server/Plugins/Core
@@ -1 +1 @@
-Subproject commit 189690e30d3c9175843d5ed27c447b8c12054f3e
+Subproject commit 9913cece597eed01177086a620ad304a68a4693c
-- 
cgit v1.2.3