From 93e77bfc7b94d4e3505189d614a7da90877f166d Mon Sep 17 00:00:00 2001 From: Trisjdc Date: Sun, 23 Aug 2015 10:47:16 +0100 Subject: Core/Players: Improve rest state handling, allow several rest states to be active Fixes https://github.com/TrinityCore/TrinityCore/issues/15325 (cherry picked from commit c14b66c24c3c0afe222a0401171e882d4a1f98d9) Conflicts: src/server/game/Entities/Player/Player.cpp src/server/game/Handlers/MiscHandler.cpp --- src/server/game/Handlers/MiscHandler.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/server/game/Handlers/MiscHandler.cpp') diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp index 8151ff70248..1d98b85a441 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -509,9 +509,7 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPackets::Misc::AreaTrigger& pack if (sObjectMgr->IsTavernAreaTrigger(packet.AreaTriggerID)) { // 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); -- cgit v1.2.3