[7323] Character Customize should not force rename. Author: aerione_alt

--HG--
branch : trunk

src/game/CharacterHandler.cpp

@@ -1300,12 +1300,16 @@ void WorldSession::HandleCharCustomize(WorldPacket& recv_data)
         return;
     }
 
-    if(objmgr.GetPlayerGUIDByName(newname))                 // character with this name already exist
+    // character with this name already exist
+    if(uint64 newguid = objmgr.GetPlayerGUIDByName(newname))
     {
-        WorldPacket data(SMSG_CHAR_CUSTOMIZE, 1);
+        if(newguid != guid)
-        data << uint8(CHAR_CREATE_NAME_IN_USE);
+        {
-        SendPacket( &data );
+            WorldPacket data(SMSG_CHAR_CUSTOMIZE, 1);
-        return;
+            data << uint8(CHAR_CREATE_NAME_IN_USE);
+            SendPacket( &data );
+            return;
+        }
     }
 
     CharacterDatabase.escape_string(newname);

src/shared/revision_nr.h

@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "7319"
+ #define REVISION_NR "7323"
 #endif // __REVISION_NR_H__