From 2bc3be31533d82a7749645281801d8e5da8f335d Mon Sep 17 00:00:00 2001
From: mschiller890 <mschiller890@gmail.com>
Date: Mon, 16 Mar 2026 19:05:55 +0100
Subject: [PATCH] FIXED: chat history clears on disconnect

---
 src/client/Minecraft.cpp | 1 +
 src/client/gui/Gui.cpp   | 5 +++++
 src/client/gui/Gui.h     | 1 +
 3 files changed, 7 insertions(+)

diff --git a/src/client/Minecraft.cpp b/src/client/Minecraft.cpp
index 1ae58c5..13bdf8f 100755
--- a/src/client/Minecraft.cpp
+++ b/src/client/Minecraft.cpp
@@ -335,6 +335,7 @@ void Minecraft::leaveGame(bool renameLevel /*=false*/)
 
 	_running = false;
 #ifndef STANDALONE_SERVER
+	gui.clearMessages();
 	if (renameLevel) {
 		setScreen(new RenameMPLevelScreen(LevelStorageSource::TempLevelId));
 	}
diff --git a/src/client/gui/Gui.cpp b/src/client/gui/Gui.cpp
index 6e85c55..6d0a25f 100755
--- a/src/client/gui/Gui.cpp
+++ b/src/client/gui/Gui.cpp
@@ -334,6 +334,11 @@ void Gui::addMessage(const std::string& _string) {
 	}
 }
 
+void Gui::clearMessages() {
+	guiMessages.clear();
+	chatScrollOffset = 0;
+}
+
 void Gui::setNowPlaying(const std::string& string) {
 	overlayMessageString = "Now playing: " + string;
 	overlayMessageTime = 20 * 3;
diff --git a/src/client/gui/Gui.h b/src/client/gui/Gui.h
index 861bdf7..1c36f83 100755
--- a/src/client/gui/Gui.h
+++ b/src/client/gui/Gui.h
@@ -66,6 +66,7 @@ public:
 	void renderProgressIndicator( const bool isTouchInterface, const int screenWidth, const int screenHeight, float a );
 
     void addMessage(const std::string& string);
+	void clearMessages();
 	void postError(int errCode);
 
     void onGraphicsReset();