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

This commit is contained in:
ntr 2019-10-25 14:23:37 +11:00
commit 23d9cd0590

View File

@ -66,7 +66,7 @@ function registerEvents(store) {
// stop fetching the game state til animations are done // stop fetching the game state til animations are done
const newRes = game.resolved.slice(currentGame.resolved.length); const newRes = game.resolved.slice(currentGame.resolved.length);
return eachSeries(newRes, (r, cb) => { return eachSeries(newRes, (r, cb) => {
if (!r.event || r.stages === '') return cb; if (!r.event || r.stages === '') return cb();
const timeout = animations.getTime(r.stages); const timeout = animations.getTime(r.stages);
const anims = animations.getObjects(r, game, account); const anims = animations.getObjects(r, game, account);
const text = animations.getText(r); const text = animations.getText(r);