Skip to content

Commit

Permalink
raidboss: allow /echo cactbot wipe to stop timelines
Browse files Browse the repository at this point in the history
Suggested in #189.
  • Loading branch information
quisquous committed Jul 26, 2018
1 parent b7bbefe commit 968f94c
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions ui/raidboss/popup-text.js
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,9 @@ class PopupText {
// are delayed. However, also reset when starting combat.
// This prevents late attacks from affecting |data| which
// throws off the next run, potentially.
if (!inCombat)
this.timelineLoader.StopCombat();

if (this.inCombat == inCombat)
return;
this.inCombat = inCombat;
Expand Down Expand Up @@ -228,6 +231,8 @@ class PopupText {
OnLog(e) {
for (let i = 0; i < e.detail.logs.length; i++) {
let log = e.detail.logs[i];
if (log.indexOf('00:0038:cactbot wipe') >= 0)
this.SetInCombat(false);

for (let j = 0; j < this.triggers.length; ++j) {
let trigger = this.triggers[j];
Expand Down

0 comments on commit 968f94c

Please sign in to comment.