josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-02-22 17:26:03 -06:00
parent 588fe25b20
commit ed5b3780ed
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/CharacterHandler.cpp
+5 -1
View File
@@ -1300,13 +1300,17 @@ void WorldSession::HandleCharCustomize(WorldPacket& recv_data)
return; return;
} }
if(objmgr.GetPlayerGUIDByName(newname)) // character with this name already exist // character with this name already exist
if(uint64 newguid = objmgr.GetPlayerGUIDByName(newname))
{
if(newguid != guid)
{ {
WorldPacket data(SMSG_CHAR_CUSTOMIZE, 1); WorldPacket data(SMSG_CHAR_CUSTOMIZE, 1);
data << uint8(CHAR_CREATE_NAME_IN_USE); data << uint8(CHAR_CREATE_NAME_IN_USE);
SendPacket( &data ); SendPacket( &data );
return; return;
} }
}
CharacterDatabase.escape_string(newname); CharacterDatabase.escape_string(newname);
Player::Customize(guid, gender, skin, face, hairStyle, hairColor, facialHair); Player::Customize(guid, gender, skin, face, hairStyle, hairColor, facialHair);
src/shared/revision_nr.h
+1 -1
View File
@@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "7319" #define REVISION_NR "7323"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__