From e40fdcb7d60c1b1f102442774ae0aa1ba11090b9 Mon Sep 17 00:00:00 2001
From: rtw1x1 <off.tw1x1@gmail.com>
Date: Wed, 21 Jan 2026 01:07:17 +0000
Subject: [PATCH] ML-Client: NPC Names client sided #2

---
 .../PythonNetworkStreamPhaseGameActor.cpp           | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/UserInterface/PythonNetworkStreamPhaseGameActor.cpp b/src/UserInterface/PythonNetworkStreamPhaseGameActor.cpp
index 775605c..296b65e 100644
--- a/src/UserInterface/PythonNetworkStreamPhaseGameActor.cpp
+++ b/src/UserInterface/PythonNetworkStreamPhaseGameActor.cpp
@@ -158,7 +158,18 @@ bool CPythonNetworkStream::RecvCharacterAdditionalInfo()
 
 	if(kNetActorData.m_dwVID == chrInfoPacket.dwVID)
 	{
-		kNetActorData.m_stName = chrInfoPacket.name;
+		if (kNetActorData.m_bType == CActorInstance::TYPE_NPC)
+		{
+			const char* c_szName;
+			if (CPythonNonPlayer::Instance().GetName(kNetActorData.m_dwRace, &c_szName))
+				kNetActorData.m_stName = c_szName;
+			else
+				kNetActorData.m_stName = chrInfoPacket.name;
+		}
+		else
+		{
+			kNetActorData.m_stName = chrInfoPacket.name;
+		}
 		kNetActorData.m_dwGuildID = chrInfoPacket.dwGuildID;
 		kNetActorData.m_dwLevel = chrInfoPacket.dwLevel;
 		kNetActorData.m_sAlignment=chrInfoPacket.sAlignment;