From 684b01e756384fe62f9db91dab7e77216adf1a6a Mon Sep 17 00:00:00 2001
From: Jérémy Zurcher <jeremy@asynk.ch>
Date: Wed, 3 Feb 2016 16:18:50 +0100
Subject: BattleCommon: turnDone() calls map.turnDone() after processing

---
 core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java b/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
index 354ba293..64d04f05 100644
--- a/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
+++ b/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
@@ -140,17 +140,18 @@ public abstract class BattleCommon implements Battle
     @Override
     public boolean turnDone()
     {
-        map.turnDone();
+        boolean ret = false;
         currentPlayer.turnEnd();
         Player winner = getWinner();
         if (winner != null) {
             currentPlayer = winner;
-            return true;
+            ret = true;
         } else {
             currentPlayer = getOpponent();
             currentPlayer.turnStart(getActionPoints());
-            return false;
         }
+        map.turnDone();
+        return ret;
     }
 
     protected boolean turnDoneForBoth()
-- 
cgit v1.2.3