Merge branch 'release/1.4.8' of ssh://git.mnml.gg:40022/~/mnml into release/1.4.8

This commit is contained in:
ntr 2019-09-20 21:11:43 +10:00
commit b7253d930a

View File

@ -87,12 +87,12 @@ function registerEvents(store) {
);
}
return setTimeout(() => {
const animSkill = anims.animTarget ? removeTier(anims.animTarget.skill) : false;
store.dispatch(actions.setAnimSource(null));
store.dispatch(actions.setAnimTarget(null));
store.dispatch(actions.setAnimText(null));
store.dispatch(actions.setAnimFocus([]));
if (!sequence.includes('END_SKILL' && anims.animTarget)
|| ['Banish', 'Invert'].includes(removeTier(anims.animTarget.skill))) return cb();
if (!sequence.includes('END_SKILL') || (animSkill && ['Banish', 'Invert'].includes(animSkill))) return cb();
return true;
}, timeout);
}, err => {