diff options
author | Jesusaves <cpntb1@ymail.com> | 2020-05-15 18:10:20 -0300 |
---|---|---|
committer | Jesusaves <cpntb1@ymail.com> | 2020-05-15 18:10:20 -0300 |
commit | 1bffac5523399d7c4a14484b9ebc07dfd11313fc (patch) | |
tree | de218d5242296f6f68438c0dfcd83c0010b02621 | |
parent | 8372f0dc00704ad326f1c8d40acbaec2c3e4250b (diff) | |
download | serverdata-1bffac5523399d7c4a14484b9ebc07dfd11313fc.tar.gz serverdata-1bffac5523399d7c4a14484b9ebc07dfd11313fc.tar.bz2 serverdata-1bffac5523399d7c4a14484b9ebc07dfd11313fc.tar.xz serverdata-1bffac5523399d7c4a14484b9ebc07dfd11313fc.zip |
Aurora Event Framework - Stop the previous event as well
-rw-r--r-- | npc/functions/aurora.txt | 9 | ||||
-rw-r--r-- | npc/functions/event.txt | 3 |
2 files changed, 12 insertions, 0 deletions
diff --git a/npc/functions/aurora.txt b/npc/functions/aurora.txt index 20d777478..af6cc7a45 100644 --- a/npc/functions/aurora.txt +++ b/npc/functions/aurora.txt @@ -96,4 +96,13 @@ function script FYE_Regnum { return; } +// Stops any Aurora Event +function script FYStopEvent { + setarray .@av$, "Kamelot", "Regnum"; + if (array_find(.@av$, $EVENT$) >= 0) { + sClear(); + $EVENT$=""; + } + return; +} diff --git a/npc/functions/event.txt b/npc/functions/event.txt index 01afec06b..89c02ee03 100644 --- a/npc/functions/event.txt +++ b/npc/functions/event.txt @@ -321,6 +321,9 @@ OnClock0000: // continue... } + // Stop previous event + FYStopEvent(); + // Trigger event framework if (.@dofy && $EVENT$ == "") FYNewEvent(); |