From fedff3eca11f292448c541731d80ca911be75bd4 Mon Sep 17 00:00:00 2001
From: Dacmot <odragon@videotron.ca>
Date: Sun, 21 May 2017 16:38:14 -0400
Subject: [PATCH] Revert change in newPlayerTurn() which did not work

---
 .../gpl/rpg/AndorsTrail/controller/CombatController.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
index c57c681b2..0ece356f8 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
@@ -457,14 +457,14 @@ public final class CombatController implements VisualEffectCompletedCallback {
 	}
 
 	private void newPlayerTurn(boolean isFirstRound) {
-		controllers.actorStatsController.setActorMaxAP(world.model.player);
-		if (!isFirstRound) controllers.gameRoundController.onNewPlayerRound();
-		world.model.uiSelections.isPlayersCombatTurn = true;
-		combatTurnListeners.onNewPlayerTurn();
 		if (canExitCombat()) {
 			exitCombat(true);
 			return;
 		}
+		controllers.actorStatsController.setActorMaxAP(world.model.player);
+		if (!isFirstRound) controllers.gameRoundController.onNewPlayerRound();
+		world.model.uiSelections.isPlayersCombatTurn = true;
+		combatTurnListeners.onNewPlayerTurn();
 	}
 
 	private static boolean hasCriticalAttack(Actor attacker, Actor target) {