diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-23 06:32:44 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-23 06:32:44 +0200 |
| commit | 8bc519a308ab78b1d6b243f49b332ddd9dd4ae17 (patch) | |
| tree | 95c92ba85108b8df3b9f58027034accba018a9d1 /src/server/authserver/Server/AuthSession.cpp | |
| parent | 059f3030b4b842a241e2f526b60f5a48956ee5e6 (diff) | |
| parent | 1bebe15698bea8ff314bfdf93b205e9dc17aeced (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
Diffstat (limited to 'src/server/authserver/Server/AuthSession.cpp')
| -rw-r--r-- | src/server/authserver/Server/AuthSession.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/authserver/Server/AuthSession.cpp b/src/server/authserver/Server/AuthSession.cpp index 560cf75b447..bcc32887616 100644 --- a/src/server/authserver/Server/AuthSession.cpp +++ b/src/server/authserver/Server/AuthSession.cpp @@ -145,7 +145,7 @@ void AuthSession::AsyncReadHeader() if ((uint8)entry.cmd == _readBuffer[0] && (entry.status == STATUS_CONNECTED || (_isAuthenticated && entry.status == STATUS_AUTHED))) { // Handle dynamic size packet - if (_readBuffer[0] == AUTH_LOGON_CHALLENGE) + if (_readBuffer[0] == AUTH_LOGON_CHALLENGE || _readBuffer[0] == AUTH_RECONNECT_CHALLENGE) { _socket.read_some(boost::asio::buffer(&_readBuffer[1], sizeof(uint8) + sizeof(uint16))); //error + size |