Board: on animation first call removePawn(), at the end setPawnOnto() to ensure revert safety

1 files changed, 9 insertions, 1 deletions

diff --git a/core/src/ch/asynk/tankontank/engine/Board.java b/core/src/ch/asynk/tankontank/engine/Board.java
index 6707b21..28e94ea 100644
--- a/core/src/ch/asynk/tankontank/engine/Board.java
+++ b/core/src/ch/asynk/tankontank/engine/Board.java
@@ -381,7 +381,15 @@ public abstract class Board implements Disposable
 
     protected void rotatePawn(final Pawn pawn, Orientation o, RunnableAnimation whenDone)
     {
-        AnimationSequence seq = pawn.getRotateAnimation(o.r(), 1);
+        removePawn(pawn);
+
+        AnimationSequence seq = pawn.getRotateAnimation(o.r(), 2);
+        seq.addAnimation(RunnableAnimation.get(pawn, new Runnable() {
+            @Override
+            public void run() {
+                setPawnOnto(pawn, pawn.getTile(), pawn.getRotation());
+            }
+        }));
         seq.addAnimation(whenDone);
         addAnimation(seq);
         pawn.rotate(o);