diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-04-20 22:54:39 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-04-20 22:54:39 +0200 |
| commit | 81c99b333826d6055932aef8a93c128cadb806ba (patch) | |
| tree | f684897696c25d64e10901f54f21b45cd16870a3 /src/server/game/Handlers/CharacterHandler.cpp | |
| parent | 40a29a3c99412b18b96341cefefb76bd9407531a (diff) | |
| parent | e25416ee2346fd361d47ef6873814b67d7086ea0 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/tools/map_extractor/dbcfile.h
src/tools/vmap4_extractor/adtfile.cpp
src/tools/vmap4_extractor/adtfile.h
src/tools/vmap4_extractor/loadlib/loadlib.h
Diffstat (limited to 'src/server/game/Handlers/CharacterHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/CharacterHandler.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index 36e2d71555b..97433fc53c3 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -1875,6 +1875,9 @@ void WorldSession::HandleCharFactionOrRaceChange(WorldPacket& recvData) } } + // resurrect the character in case he's dead + sObjectAccessor->ConvertCorpseForPlayer(guid); + CharacterDatabase.EscapeString(newname); Player::Customize(guid, gender, skin, face, hairStyle, hairColor, facialHair); SQLTransaction trans = CharacterDatabase.BeginTransaction(); |