aboutsummaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
Diffstat (limited to 'src/game')
-rw-r--r--src/game/MovementHandler.cpp15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/game/MovementHandler.cpp b/src/game/MovementHandler.cpp
index 3219237043a..e29a2215f05 100644
--- a/src/game/MovementHandler.cpp
+++ b/src/game/MovementHandler.cpp
@@ -150,13 +150,20 @@ void WorldSession::HandleMoveWorldportAckOpcode()
}
}
- if (mInstance && mEntry->IsDungeon())
+ if (mInstance)
{
Difficulty diff = GetPlayer()->GetDifficulty(mEntry->IsRaid());
- if (uint32 timeReset = sInstanceSaveManager.GetResetTimeFor(GetPlayer()->GetMapId(),diff))
+ if(MapDifficulty const* mapDiff = GetMapDifficultyData(mEntry->MapID,diff))
{
- uint32 timeleft = timeReset - time(NULL);
- GetPlayer()->SendInstanceResetWarning(GetPlayer()->GetMapId(), diff, timeleft);
+ if (mapDiff->resetTime)
+ {
+
+ if (uint32 timeReset = sInstanceSaveManager.GetResetTimeFor(mEntry->MapID,diff))
+ {
+ uint32 timeleft = timeReset - time(NULL);
+ GetPlayer()->SendInstanceResetWarning(mEntry->MapID, diff, timeleft);
+ }
+ }
}
}