summaryrefslogtreecommitdiffstats
path: root/core/src/ch/asynk/rustanddust
diff options
context:
space:
mode:
Diffstat (limited to 'core/src/ch/asynk/rustanddust')
-rw-r--r--core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java6
1 files changed, 3 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 56c0801..e046628 100644
--- a/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
+++ b/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
@@ -161,9 +161,6 @@ public abstract class BattleCommon implements Battle
protected Player getWinner(int minTurns)
{
- if (!turnDoneForBoth())
- return null;
-
Player a = players[0];
Player b = players[1];
@@ -175,6 +172,9 @@ public abstract class BattleCommon implements Battle
if (a.getTurn() <= minTurns)
return null;
+ if (!turnDoneForBoth())
+ return null;
+
a.objectivesWon = map.objectivesCount(a.army);
b.objectivesWon = map.objectivesCount(b.army);