diff options
| author | mik1893 <michele.roscelli@gmail.com> | 2015-06-29 19:39:26 +0200 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2015-07-03 01:07:14 +0100 |
| commit | 587baa94096845637b63ace27d5eabb441d99e0a (patch) | |
| tree | f2660f3d15cf616d3d3694d5716849836babf375 /src/server | |
| parent | c7ca7397115856876c52cc31198101173023c9c8 (diff) | |
Merge pull request #14976 from robinsch/wgTimer
Core/WorldState: WG Interface timer
Closes issue #14913
(cherry picked from commit c8df10dbc00c10fc81535e2904a3092465d654e4)
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index c167e416090..ab7aabf4089 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -9506,13 +9506,9 @@ void Player::SendBattlefieldWorldStates() { if (Battlefield* wg = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG)) { - if (wg->IsWarTime()) - SendUpdateWorldState(ClockWorldState[1], uint32(time(NULL))); - else // Time to next battle - { - uint32 timer = wg->GetTimer() / 1000; - SendUpdateWorldState(ClockWorldState[1], time(NULL) + timer); - } + SendUpdateWorldState(BATTLEFIELD_WG_WORLD_STATE_ACTIVE, wg->IsWarTime() ? 0 : 1); + uint32 timer = wg->IsWarTime() ? 0 : (wg->GetTimer() / 1000); // 0 - Time to next battle + SendUpdateWorldState(ClockWorldState[1], uint32(time(NULL) + timer)); } } } |