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

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

1 files changed, 12 insertions, 2 deletions

diff --git a/Minecraft.Client/Common/UI/UIGroup.cpp b/Minecraft.Client/Common/UI/UIGroup.cpp
index 1899d05b..e8bb9fe6 100644
--- a/Minecraft.Client/Common/UI/UIGroup.cpp
+++ b/Minecraft.Client/Common/UI/UIGroup.cpp
@@ -13,6 +13,8 @@ UIGroup::UIGroup(EUIGroup group, int iPad)
 
 	m_updateFocusStateCountdown = 0;
 
+	m_viewportType = C4JRender::VIEWPORT_TYPE_FULLSCREEN;
+
 	for(unsigned int i = 0; i < eUILayer_COUNT; ++i)
 	{
 		m_layers[i] = new UILayer(this);
@@ -39,8 +41,6 @@ UIGroup::UIGroup(EUIGroup group, int iPad)
 		m_pressStartToPlay = (UIComponent_PressStartToPlay *)m_layers[(int)eUILayer_Tooltips]->addComponent(0, eUIComponent_PressStartToPlay);
 	}
 
-	m_viewportType = C4JRender::VIEWPORT_TYPE_FULLSCREEN;
-
 	// 4J Stu - Pre-allocate this for cached rendering in scenes. It's horribly slow to do dynamically, but we should only need one
 	// per group as we will only be displaying one of these types of scenes at a time
 	m_commandBufferList = MemoryTracker::genLists(1);
@@ -318,6 +318,16 @@ void UIGroup::HandleDLCLicenseChange()
 }
 #endif
 
+void UIGroup::HandleMessage(EUIMessage message, void *data)
+{
+	// Ignore this group if the player isn't signed in
+	if(m_iPad >= 0 && !ProfileManager.IsSignedIn(m_iPad)) return;
+	for(unsigned int i = 0; i < eUILayer_COUNT; ++i)
+	{
+		m_layers[i]->HandleMessage(message, data);
+	}
+}
+
 bool UIGroup::IsFullscreenGroup()
 {
 	return m_group == eUIGroup_Fullscreen;