From 81de29565d5995b8db9903b27e0b05f215022d91 Mon Sep 17 00:00:00 2001
From: ChillerDragon <ChillerDragon@gmail.com>
Date: Fri, 16 Aug 2024 12:37:05 +0800
Subject: [PATCH] Fix old 0.7 skins overwriting 0.6 skins in chat

Closed #8731
---
 src/game/client/components/chat.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/game/client/components/chat.cpp b/src/game/client/components/chat.cpp
index b94339dfa..438e4f49f 100644
--- a/src/game/client/components/chat.cpp
+++ b/src/game/client/components/chat.cpp
@@ -1303,12 +1303,15 @@ void CChat::OnRender()
 				RenderInfo.m_ColorFeet = Line.m_ColorFeet;
 				RenderInfo.m_Size = TeeSize;
 
-				for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
+				if(Client()->IsSixup())
 				{
-					RenderInfo.m_Sixup.m_aColors[Part] = Line.m_Sixup.m_aColors[Part];
-					RenderInfo.m_Sixup.m_aTextures[Part] = Line.m_Sixup.m_aTextures[Part];
-					RenderInfo.m_Sixup.m_HatSpriteIndex = Line.m_Sixup.m_HatSpriteIndex;
-					RenderInfo.m_Sixup.m_HatTexture = Line.m_Sixup.m_HatTexture;
+					for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
+					{
+						RenderInfo.m_Sixup.m_aColors[Part] = Line.m_Sixup.m_aColors[Part];
+						RenderInfo.m_Sixup.m_aTextures[Part] = Line.m_Sixup.m_aTextures[Part];
+						RenderInfo.m_Sixup.m_HatSpriteIndex = Line.m_Sixup.m_HatSpriteIndex;
+						RenderInfo.m_Sixup.m_HatTexture = Line.m_Sixup.m_HatTexture;
+					}
 				}
 
 				float RowHeight = FontSize() + RealMsgPaddingY;