diff options
| author | jackpoz <giacomopoz@gmail.com> | 2015-07-08 23:32:04 +0200 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2015-07-12 12:47:43 +0100 |
| commit | 1915a4ad49e2767a57adcf5662b43ad8690005d1 (patch) | |
| tree | b5c65c41d836e2b2f824861a60173af937d7b3cf /src/server/game/Maps/Map.cpp | |
| parent | 4479cbf1706332bade241a8348a9cc3397eebcee (diff) | |
Core/Instances: Fix some Instance Lock chat messages
Always send a Welcome type Instance Lock chat message when entering an instance instead of changing type based on remaining time.
Fix scheduled warning message to always send "Your instance lock for ... will expire in 0 minutes." even if there are hours left, issue added in 4193806dba4de81f0e24c94bc470faaaa0e717cf , closes #11519 .
Update warning messages based on remaining time so that the most meaning is always used (6 hours left, 59 minutes left, etc).
(cherry picked from commit fae826958915673338868d0b3b273860630638fb)
Conflicts:
src/server/game/Handlers/MovementHandler.cpp
src/server/game/Maps/Map.cpp
Diffstat (limited to 'src/server/game/Maps/Map.cpp')
| -rw-r--r-- | src/server/game/Maps/Map.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 26a3d38635d..008bb89ff4c 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -3234,7 +3234,7 @@ void InstanceMap::UnloadAll() void InstanceMap::SendResetWarnings(uint32 timeLeft) const { for (MapRefManager::const_iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr) - itr->GetSource()->SendInstanceResetWarning(GetId(), itr->GetSource()->GetDifficultyID(GetEntry()), timeLeft); + itr->GetSource()->SendInstanceResetWarning(GetId(), itr->GetSource()->GetDifficultyID(GetEntry()), timeLeft, true); } void InstanceMap::SetResetSchedule(bool on) |