aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWarpten <vertozor@gmail.com>2012-12-26 22:20:08 +0100
committerWarpten <vertozor@gmail.com>2012-12-26 22:21:06 +0100
commitb81166651a279586146dedcab3cc09bc7e0dee77 (patch)
treeb9fe46cc16f638edfc21bfd4401975780a839826
parent88305adc63ac74958ea28a541d8b84630e928f4e (diff)
Core/Battlegrounds: Don't set a remaining time for arenas.
-rw-r--r--src/server/game/Battlegrounds/Battleground.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp
index 16220d17170..a5c92962f57 100644
--- a/src/server/game/Battlegrounds/Battleground.cpp
+++ b/src/server/game/Battlegrounds/Battleground.cpp
@@ -274,7 +274,7 @@ void Battleground::Update(uint32 diff)
// after 47 minutes without one team losing, the arena closes with no winner and no rating change
if (isArena())
{
- if (GetElapsedTime() >= 47*MINUTE*IN_MILLISECONDS)
+ if (GetElapsedTime() >= 47 * MINUTE*IN_MILLISECONDS)
{
UpdateArenaWorldState();
CheckArenaAfterTimerConditions();
@@ -466,8 +466,8 @@ inline void Battleground::_ProcessJoin(uint32 diff)
// *********************************************************
ModifyStartDelayTime(diff);
- // I know it's a too big but it's the value sent in packet, I get it from retail sniff.
- SetRemainingTime(300000);
+ if (!isArena())
+ SetRemainingTime(300000);
if (m_ResetStatTimer > 5000)
{