From 147d9dd3dd292ff950c4cff7ec7c26793424d9a0 Mon Sep 17 00:00:00 2001 From: n0n4m3 Date: Sat, 16 Jan 2010 19:54:57 +0300 Subject: Avoid send reset warning to map/difficulty cases without fixedreset time, by VladimirMangos. --HG-- branch : trunk --- src/game/MovementHandler.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'src') 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); + } + } } } -- cgit v1.2.3