aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Handlers/MovementHandler.cpp
diff options
context:
space:
mode:
authorRat <gmstreetrat@gmail.com>2014-11-10 15:18:42 +0100
committerRat <gmstreetrat@gmail.com>2014-11-10 15:18:42 +0100
commitef9bc5b17b3ad4f3bdfbd67c937b90d8d1dcd3eb (patch)
tree9e939bb2b427ba8ae3e4c5512a6fc9975469c31f /src/server/game/Handlers/MovementHandler.cpp
parentd268b81044707e15266eadb4ab49f176135d4c26 (diff)
parentac0ff1fc9b4c409089bbcb0256bdbc2f5cc4a405 (diff)
Merge branch 'Intel-dbc' into 6.x
Diffstat (limited to 'src/server/game/Handlers/MovementHandler.cpp')
-rw-r--r--src/server/game/Handlers/MovementHandler.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp
index eebccd7408a..21ef1fc6ae0 100644
--- a/src/server/game/Handlers/MovementHandler.cpp
+++ b/src/server/game/Handlers/MovementHandler.cpp
@@ -158,14 +158,14 @@ void WorldSession::HandleMoveWorldportAckOpcode()
if (mInstance)
{
Difficulty diff = GetPlayer()->GetDifficulty(mEntry->IsRaid());
- if (MapDifficulty const* mapDiff = GetMapDifficultyData(mEntry->MapID, diff))
+ if (MapDifficulty const* mapDiff = GetMapDifficultyData(mEntry->ID, diff))
{
if (mapDiff->resetTime)
{
- if (time_t timeReset = sInstanceSaveMgr->GetResetTimeFor(mEntry->MapID, diff))
+ if (time_t timeReset = sInstanceSaveMgr->GetResetTimeFor(mEntry->ID, diff))
{
uint32 timeleft = uint32(timeReset - time(NULL));
- GetPlayer()->SendInstanceResetWarning(mEntry->MapID, diff, timeleft);
+ GetPlayer()->SendInstanceResetWarning(mEntry->ID, diff, timeleft);
}
}
}