From ed5b3780ed92fcda07323ce12bbc25a520474006 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Sun, 22 Feb 2009 17:26:03 -0600
Subject: [PATCH] [7323] Character Customize should not force rename. Author:
 aerione_alt

--HG--
branch : trunk
---
 src/game/CharacterHandler.cpp | 14 +++++++++-----
 src/shared/revision_nr.h      |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/game/CharacterHandler.cpp b/src/game/CharacterHandler.cpp
index ffdd9942bb5..8970bf82822 100644
--- a/src/game/CharacterHandler.cpp
+++ b/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);
-        data << uint8(CHAR_CREATE_NAME_IN_USE);
-        SendPacket( &data );
-        return;
+        if(newguid != guid)
+        {
+            WorldPacket data(SMSG_CHAR_CUSTOMIZE, 1);
+            data << uint8(CHAR_CREATE_NAME_IN_USE);
+            SendPacket( &data );
+            return;
+        }
     }
 
     CharacterDatabase.escape_string(newname);
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index cb62d4285c0..ae44645b3f5 100644
--- a/src/shared/revision_nr.h
+++ b/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__