Core/Misc: Check if race is changed before performing faction-change actions. (By tibbi)

1 files changed, 3 insertions, 1 deletions

diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp
index dc930b8a381..f14e9cc8e8d 100644
--- a/src/server/game/Handlers/CharacterHandler.cpp
+++ b/src/server/game/Handlers/CharacterHandler.cpp
@@ -1615,7 +1615,6 @@ void WorldSession::HandleEquipmentSetUse(WorldPacket &recv_data)
 
 void WorldSession::HandleCharFactionOrRaceChange(WorldPacket& recv_data)
 {
-    // TODO: Move queries to prepared statements
     uint64 guid;
     std::string newname;
     uint8 gender, skin, face, hairStyle, hairColor, facialHair, race;
@@ -1732,6 +1731,9 @@ void WorldSession::HandleCharFactionOrRaceChange(WorldPacket& recv_data)
 
     sWorld->UpdateCharacterNameData(GUID_LOPART(guid), newname, gender, race);
 
+    if (oldRace == race)
+        return;
+
     TeamId team = TEAM_ALLIANCE;
 
     // Search each faction is targeted