diff options
| author | Jesusaves <cpntb1@ymail.com> | 2021-10-10 23:24:09 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2021-10-10 23:24:09 -0300 |
| commit | 233d7dfc487303afc48eae2f9e99f08f10e3cf80 (patch) | |
| tree | d6c54b3572fdf04e64cb2163edd6fd531fa2dfaa | |
| parent | 5afdb139fb1adbc843acd68493da0627623cdb73 (diff) | |
| download | serverdata-233d7dfc487303afc48eae2f9e99f08f10e3cf80.tar.gz serverdata-233d7dfc487303afc48eae2f9e99f08f10e3cf80.tar.bz2 serverdata-233d7dfc487303afc48eae2f9e99f08f10e3cf80.tar.xz serverdata-233d7dfc487303afc48eae2f9e99f08f10e3cf80.zip | |
Prevent a rare theoretical bug where Thanksgiving could end before the Aeros Event
| -rw-r--r-- | npc/functions/event.txt | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/npc/functions/event.txt b/npc/functions/event.txt index 7ba1e802c..a627788de 100644 --- a/npc/functions/event.txt +++ b/npc/functions/event.txt @@ -369,11 +369,6 @@ OnInit: .score=0; .event=0; OnTimer90000: - if ($EVENT$ != "Thanksgiving") - end; - .users=getusers(1); - .score+=.users; - // Abort event and reset score if (.event && .event < gettimetick(2)) { .event=0; @@ -385,6 +380,18 @@ OnTimer90000: announce ("The event is over!"), bc_all|bc_npc; } + // Skip processment until current event ends + if (.event) { + initnpctimer; + end; + } + + // Stop counting or update scores + if ($EVENT$ != "Thanksgiving") + end; + .users=getusers(1); + .score+=.users; + // Do event (lasts 30 minutes) if (!.event && !$@MK_SCENE && .score > 300 && .users > 3) { /* Reserve Aeros */ |