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) {