From c79ccf394fb6b9d803eb52cbc3d3d789765b800f Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Sat, 6 Feb 2016 23:23:32 +0000
Subject: [PATCH] Prevent launching battle while animation in progress

---
 .../planarconquest/ConquestMultiverseScreen.java | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java
index 253eb5e456a..f9d1bda6870 100644
--- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java
+++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java
@@ -243,18 +243,18 @@ public class ConquestMultiverseScreen extends FScreen {
         });
     }
 
+    @Override
+    public void buildTouchListeners(float screenX, float screenY, List<FDisplayObject> listeners) {
+        //prevent user touch actions while an animation is in progress
+        if (planeGrid.activeMoveAnimation == null && planeGrid.activeBadgeAnimation == null) {
+            super.buildTouchListeners(screenX, screenY, listeners);
+        }
+    }
+
     private class PlaneGrid extends FScrollPane {
         private MoveAnimation activeMoveAnimation;
         private BadgeAnimation activeBadgeAnimation;
 
-        @Override
-        public void buildTouchListeners(float screenX, float screenY, List<FDisplayObject> listeners) {
-            //prevent user touch actions while an animation is in progress
-            if (activeMoveAnimation == null && activeBadgeAnimation == null) {
-                super.buildTouchListeners(screenX, screenY, listeners);
-            }
-        }
-
         @Override
         public boolean tap(float x, float y, int count) {
             //start move animation if a path can be found to tapped location