diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2014-01-31 23:51:07 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2014-01-31 23:51:07 +0100 |
| commit | 224da4795283d1314bd255611730a2b46f84f68c (patch) | |
| tree | 9f118a2f9bafcce24ee3fd62057689bbd085d0d6 /src/server/game/Handlers/MiscHandler.cpp | |
| parent | 9316b947863dcac7675fc9e4cf43a44c4e678ab9 (diff) | |
| parent | 19172ee4c26a12b844a7e1f435daed9bb44bf625 (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/Player/Player.h
src/server/scripts/Spells/spell_dk.cpp
Diffstat (limited to 'src/server/game/Handlers/MiscHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/MiscHandler.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp index 8c9cc9c1338..b0514467667 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -1164,7 +1164,6 @@ void WorldSession::HandleMoveRootAck(WorldPacket& recvData) void WorldSession::HandleSetActionBarToggles(WorldPacket& recvData) { uint8 actionBar; - recvData >> actionBar; if (!GetPlayer()) // ignore until not logged (check needed because STATUS_AUTHED) |