Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Events: Adjust timings and occurrence for Fireworks Show at New Years Eve

Browse Source 
(cherry picked from commit ef4b8da56b)
This commit is contained in:
Kittnz
2016-12-27 17:05:15 +01:00
committed by DoctorKraft
parent 975923119a
commit 53339c4312
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/scripts/Events/fireworks_show.cpp
View File

@@ -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));