Core: add some missing Player Name normalization on input data

1 files changed, 7 insertions, 7 deletions

diff --git a/src/server/game/Handlers/GroupHandler.cpp b/src/server/game/Handlers/GroupHandler.cpp
index 05b39c4788a..c94c4dfce4e 100644
--- a/src/server/game/Handlers/GroupHandler.cpp
+++ b/src/server/game/Handlers/GroupHandler.cpp
@@ -588,6 +588,9 @@ void WorldSession::HandleGroupChangeSubGroupOpcode(WorldPacket& recvData)
     recvData >> name;
     recvData >> groupNr;
 
+    if (!normalizePlayerName(name))
+        return;
+
     if (groupNr >= MAX_RAID_SUBGROUPS)
         return;
 
@@ -598,17 +601,14 @@ void WorldSession::HandleGroupChangeSubGroupOpcode(WorldPacket& recvData)
     if (!group->HasFreeSlotSubGroup(groupNr))
         return;
 
-    Player* movedPlayer = ObjectAccessor::FindConnectedPlayerByName(name);
     ObjectGuid guid;
-    if (movedPlayer)
-    {
+    if (Player* movedPlayer = ObjectAccessor::FindConnectedPlayerByName(name))
         guid = movedPlayer->GetGUID();
-    }
     else
-    {
-        CharacterDatabase.EscapeString(name);
         guid = sWorld->GetCharacterGuidByName(name);
-    }
+
+    if (guid.IsEmpty())
+        return;
 
     group->ChangeMembersGroup(guid, groupNr);
 }