diff options
| author | Kittnz <frederik156@hotmail.com> | 2016-12-27 17:05:15 +0100 |
|---|---|---|
| committer | Kittnz <frederik156@hotmail.com> | 2016-12-27 17:05:15 +0100 |
| commit | ef4b8da56bbb502c86b5593656acc2e06632a0ee (patch) | |
| tree | a3cf422bd62a240ae2722a58a9ac96e223b5ffb9 /src | |
| parent | b9146102f1ef573a32ec7b5a88a1e317cf67fa72 (diff) | |
Core/Events: Adjust timings and occurrence for Fireworks Show at New Years Eve
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/scripts/Events/fireworks_show.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/server/scripts/Events/fireworks_show.cpp b/src/server/scripts/Events/fireworks_show.cpp index 4e996f8fe29..fbde91fd395 100644 --- a/src/server/scripts/Events/fireworks_show.cpp +++ b/src/server/scripts/Events/fireworks_show.cpp @@ -797,8 +797,7 @@ public: localtime_r(&time, &localTm); // Start - if (((localTm.tm_min == 0 && localTm.tm_sec == 0) && !_started && IsHolidayActive(HOLIDAY_FIREWORKS_SPECTACULAR)) || - ((localTm.tm_hour == 0 && localTm.tm_min == 0 && localTm.tm_sec == 0) && !_started && IsEventActive(GAME_EVENT_NEW_YEAR))) + if ((localTm.tm_min == 0 && localTm.tm_sec == 0 && !_started) && (IsHolidayActive(HOLIDAY_FIREWORKS_SPECTACULAR) || IsEventActive(GAME_EVENT_NEW_YEAR))) { _events.ScheduleEvent(EVENT_CHEER, Seconds(1)); _events.ScheduleEvent(EVENT_FIRE, Seconds(1)); @@ -806,14 +805,14 @@ public: } // Event is active - if ((localTm.tm_min >= 0 && localTm.tm_sec >= 1 && localTm.tm_min <= 9 && localTm.tm_sec <= 59) && !_started && IsHolidayActive(HOLIDAY_FIREWORKS_SPECTACULAR)) + if ((localTm.tm_min >= 0 && localTm.tm_sec >= 1 && localTm.tm_min <= 9 && localTm.tm_sec <= 59 && !_started) && (IsHolidayActive(HOLIDAY_FIREWORKS_SPECTACULAR) || IsEventActive(GAME_EVENT_NEW_YEAR))) { _events.ScheduleEvent(EVENT_FIRE, Seconds(1)); _started = true; } // Stop - if ((localTm.tm_min == 10 && localTm.tm_sec == 0) || (localTm.tm_min == 10 && localTm.tm_sec == 0 && localTm.tm_hour == 0 && _started == true)) + if ((localTm.tm_min == 10 && localTm.tm_sec == 0) && _started == true) { _started = false; _events.ScheduleEvent(EVENT_CHEER, Seconds(1)); |