From 50f475ca5bf5f3b6f4b2181706af94b247cc4e02 Mon Sep 17 00:00:00 2001 From: Guangcong Luo Date: Fri, 6 Nov 2015 06:16:08 -0500 Subject: [PATCH] Fix battle.fastForwardTo(0) This is currently just treated as a reset. The important thing is, it doesn't behave erratically as it did previously. --- js/battle.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/js/battle.js b/js/battle.js index c5a1d19de..5d9560ee8 100644 --- a/js/battle.js +++ b/js/battle.js @@ -6024,9 +6024,11 @@ var Battle = (function () { this.activityQueueActive = true; if (paused) this.pause(); else this.paused = false; - this.fastForward = time; - this.elem.append('
seeking...
'); - $.fx.off = true; + if (time) { + this.fastForward = time; + this.elem.append('
seeking...
'); + $.fx.off = true; + } this.elem.find(':animated').finish(); this.swapQueues(); this.nextActivity();