diff options
| author | David Carlos Manuelda <stormbyte@gmail.com> | 2015-08-23 20:32:54 +0200 |
|---|---|---|
| committer | David Carlos Manuelda <stormbyte@gmail.com> | 2015-08-23 20:32:54 +0200 |
| commit | 603f49a55134de21b6c02b3cfcd9cb32b44c5f7b (patch) | |
| tree | 7e95af3030bbfa5442181329a9cdd8854ac4d195 /src/server/game/Handlers/MiscHandler.cpp | |
| parent | 3a4f54197c05ce4209c7e659acfd382896607265 (diff) | |
| parent | c14b66c24c3c0afe222a0401171e882d4a1f98d9 (diff) | |
Merge pull request #15327 from Trisjdc/fix_rest_state
Core/Players: Improve rest state handling, allow several rest states to be active
Diffstat (limited to 'src/server/game/Handlers/MiscHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/MiscHandler.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp index 683b77e7aa0..7a9760ecf80 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -844,9 +844,7 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket& recvData) if (sObjectMgr->IsTavernAreaTrigger(triggerId)) { // set resting flag we are in the inn - player->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING); - player->InnEnter(time(nullptr), atEntry->id); - player->SetRestType(REST_TYPE_IN_TAVERN); + player->SetRestFlag(REST_FLAG_IN_TAVERN, atEntry->id); if (sWorld->IsFFAPvPRealm()) player->RemoveByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP); |