diff options
| author | Kittnz <frederik156@hotmail.com> | 2016-12-27 17:05:15 +0100 |
|---|---|---|
| committer | DoctorKraft <DoctorKraft@users.noreply.github.com> | 2018-03-18 00:19:39 +0100 |
| commit | 53339c4312885115bfab11d3d04eaebc4ce3adc2 (patch) | |
| tree | c696ed8f5ccab85f0356dabf7490c22c3d849c5c | |
| parent | 975923119ab13b8b804b261ab8860fdc63c8d9ac (diff) | |
Core/Events: Adjust timings and occurrence for Fireworks Show at New Years Eve
(cherry picked from commit ef4b8da56bbb502c86b5593656acc2e06632a0ee)
| -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 287f6990c8b..4e5c0b8374b 100644 --- a/src/server/scripts/Events/fireworks_show.cpp +++ b/src/server/scripts/Events/fireworks_show.cpp @@ -801,8 +801,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)); @@ -810,14 +809,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)); |