diff options
| author | Wyrserth <wyrserth@protonmail.com> | 2019-07-01 14:39:06 +0200 |
|---|---|---|
| committer | Wyrserth <wyrserth@protonmail.com> | 2019-07-01 14:39:52 +0200 |
| commit | 028d16a812bd3ff56f19da919ca1a35e7523fe8c (patch) | |
| tree | b761bbd1fdc625e1854a29d565e0ac729c5dd42f | |
| parent | 72917d5036be071a7243c1faa602dd1ad17543ba (diff) | |
Script/DarkmoonFaire: fix logical error in go_darkmoon_faire_music.
Closes #23548.
| -rw-r--r-- | src/server/scripts/World/go_scripts.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index 273c90cb6f2..08061269631 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -1818,14 +1818,14 @@ public: { switch (eventId) { - case EVENT_DFM_START_MUSIC: - if (!IsHolidayActive(HOLIDAY_DARKMOON_FAIRE_ELWYNN) || !IsHolidayActive(HOLIDAY_DARKMOON_FAIRE_THUNDER) || !IsHolidayActive(HOLIDAY_DARKMOON_FAIRE_SHATTRATH)) + case EVENT_DFM_START_MUSIC: + if (!IsHolidayActive(HOLIDAY_DARKMOON_FAIRE_ELWYNN) && !IsHolidayActive(HOLIDAY_DARKMOON_FAIRE_THUNDER) && !IsHolidayActive(HOLIDAY_DARKMOON_FAIRE_SHATTRATH)) + break; + me->PlayDirectMusic(MUSIC_DARKMOON_FAIRE_MUSIC); + _events.ScheduleEvent(EVENT_DFM_START_MUSIC, 5s); // Every 5 second's SMSG_PLAY_MUSIC packet (PlayDirectMusic) is pushed to the client (sniffed value) + break; + default: break; - me->PlayDirectMusic(MUSIC_DARKMOON_FAIRE_MUSIC); - _events.ScheduleEvent(EVENT_DFM_START_MUSIC, 5s); // Every 5 second's SMSG_PLAY_MUSIC packet (PlayDirectMusic) is pushed to the client (sniffed value) - break; - default: - break; } } } |