Merge branch 'release/1.4.8' of ssh://git.mnml.gg:40022/~/mnml into release/1.4.8
This commit is contained in:
commit
b7253d930a
@ -87,12 +87,12 @@ function registerEvents(store) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
return setTimeout(() => {
|
return setTimeout(() => {
|
||||||
|
const animSkill = anims.animTarget ? removeTier(anims.animTarget.skill) : false;
|
||||||
store.dispatch(actions.setAnimSource(null));
|
store.dispatch(actions.setAnimSource(null));
|
||||||
store.dispatch(actions.setAnimTarget(null));
|
store.dispatch(actions.setAnimTarget(null));
|
||||||
store.dispatch(actions.setAnimText(null));
|
store.dispatch(actions.setAnimText(null));
|
||||||
store.dispatch(actions.setAnimFocus([]));
|
store.dispatch(actions.setAnimFocus([]));
|
||||||
if (!sequence.includes('END_SKILL' && anims.animTarget)
|
if (!sequence.includes('END_SKILL') || (animSkill && ['Banish', 'Invert'].includes(animSkill))) return cb();
|
||||||
|| ['Banish', 'Invert'].includes(removeTier(anims.animTarget.skill))) return cb();
|
|
||||||
return true;
|
return true;
|
||||||
}, timeout);
|
}, timeout);
|
||||||
}, err => {
|
}, err => {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user