Core/Player: moved zone/area updating and tavern resting checks into Heartbeat and movement updates

(cherry picked from commit cb4c9009b3706a2823ada05eec9803a773f9b34e)

# Conflicts:
#	src/server/game/Entities/Player/Player.cpp

2 files changed, 5 insertions, 3 deletions

diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp
index 0ed51e367ce..451526e1cf8 100644
--- a/src/server/game/Handlers/MiscHandler.cpp
+++ b/src/server/game/Handlers/MiscHandler.cpp
@@ -566,7 +566,7 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPackets::AreaTrigger::AreaTrigge
     {
         // set resting flag we are in the inn
         if (packet.Entered)
-            player->GetRestMgr().SetRestFlag(REST_FLAG_IN_TAVERN, atEntry->ID);
+            player->GetRestMgr().SetInnTriggerID(atEntry->ID);
         else
             player->GetRestMgr().RemoveRestFlag(REST_FLAG_IN_TAVERN);
 
diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp
index 15fd14491a2..8f0eac766a6 100644
--- a/src/server/game/Handlers/MovementHandler.cpp
+++ b/src/server/game/Handlers/MovementHandler.cpp
@@ -492,7 +492,7 @@ void WorldSession::HandleMovementOpcode(OpcodeClient opcode, MovementInfo& movem
             Unit::ProcSkillsAndAuras(plrMover, nullptr, PROC_FLAG_JUMP, PROC_FLAG_NONE, PROC_SPELL_TYPE_MASK_ALL, PROC_SPELL_PHASE_NONE, PROC_HIT_NONE, nullptr, nullptr, nullptr);
         }
 
-        // Whenever a player stops a movement action, an indoor/outdoor check is being performed
+        // Whenever a player stops a movement action, several position based checks and updates are being performed
         switch (opcode)
         {
             case CMSG_MOVE_SET_FLY:
@@ -503,7 +503,9 @@ void WorldSession::HandleMovementOpcode(OpcodeClient opcode, MovementInfo& movem
             case CMSG_MOVE_STOP_SWIM:
             case CMSG_MOVE_STOP_PITCH:
             case CMSG_MOVE_STOP_ASCEND:
-                plrMover->CheckOutdoorsAuraRequirements();
+                plrMover->UpdateZoneAndAreaId();
+                plrMover->UpdateIndoorsOutdoorsAuras();
+                plrMover->UpdateTavernRestingState();
                 break;
             default:
                 break;