Merge branch 'main' into pr/win64-world-saves

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

1 files changed, 16 insertions, 0 deletions

diff --git a/Minecraft.World/SignTileEntity.cpp b/Minecraft.World/SignTileEntity.cpp
index 09b8e022..74adc8cc 100644
--- a/Minecraft.World/SignTileEntity.cpp
+++ b/Minecraft.World/SignTileEntity.cpp
@@ -30,6 +30,8 @@ SignTileEntity::SignTileEntity() : TileEntity()
 	m_iSelectedLine = -1;
 
 	_isEditable = true;
+
+	playerWhoMayEdit = nullptr;
 }
 
 SignTileEntity::~SignTileEntity()
@@ -102,6 +104,20 @@ bool SignTileEntity::isEditable()
 void SignTileEntity::setEditable(bool isEditable)
 {
 	this->_isEditable = isEditable;
+	if (!isEditable)
+	{
+		playerWhoMayEdit = nullptr;
+	}
+}
+
+void SignTileEntity::setAllowedPlayerEditor(shared_ptr<Player> player)
+{
+	playerWhoMayEdit = player;
+}
+
+shared_ptr<Player> SignTileEntity::getPlayerWhoMayEdit()
+{
+	return playerWhoMayEdit;
 }
 
 void SignTileEntity::setChanged()