diff options
| author | Michael <michaelneubert1988@gmail.com> | 2014-06-05 19:42:48 +0200 |
|---|---|---|
| committer | Michael <michaelneubert1988@gmail.com> | 2014-06-05 19:42:48 +0200 |
| commit | 83c2e79d52a57ec670b439ed6f822dd18e0ac55e (patch) | |
| tree | 774cb4f6a175e60ca979772559efa60411e9eff4 /src/server/game/Handlers/CharacterHandler.cpp | |
| parent | 289a5c4318c5509eafeb36389a81bddc2ed349ca (diff) | |
| parent | 36102bea64d536b6ac04ac728c64321cfc5e55f2 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/scripts/Spells/spell_paladin.cpp
Diffstat (limited to 'src/server/game/Handlers/CharacterHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/CharacterHandler.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index 737197878fb..5345113d106 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -788,6 +788,7 @@ void WorldSession::HandlePlayerLoginOpcode(WorldPacket& recvData) if (PlayerLoading() || GetPlayer() != NULL) { TC_LOG_ERROR("network", "Player tries to login again, AccountId = %d", GetAccountId()); + KickPlayer(); return; } |