From a3bb9cdb48e2e8b25c255bc160f1e3a96b315e5c Mon Sep 17 00:00:00 2001 From: aerione_alt Date: Sun, 22 Feb 2009 05:32:00 +0300 Subject: [PATCH] [7323] Character Customize should not force rename. Signed-off-by: VladimirMangos --- 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 9f3e07029..49e42c537 100644 --- a/src/game/CharacterHandler.cpp +++ b/src/game/CharacterHandler.cpp @@ -1284,12 +1284,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 8dc20ea34..ae44645b3 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 "7322" + #define REVISION_NR "7323" #endif // __REVISION_NR_H__