From 2c95d0b88d1a36d4d78c2ddee84a34eef3e82f25 Mon Sep 17 00:00:00 2001
From: Dacmot <odragon@videotron.ca>
Date: Mon, 22 May 2017 22:37:14 -0400
Subject: [PATCH] Add back round counters reset and move a function call to put
 it with similar functions

---
 .../com/gpl/rpg/AndorsTrail/controller/CombatController.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
index 9e43feb59..ac3674114 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
@@ -55,7 +55,6 @@ public final class CombatController implements VisualEffectCompletedCallback {
 	public void exitCombat(boolean pickupLootBags) {
 		setCombatSelection(null, null);
 		world.model.uiSelections.isInCombat = false;
-		combatTurnListeners.onCombatEnded();
 		world.model.uiSelections.selectedPosition = null;
 		world.model.uiSelections.selectedMonster = null;
 		endOfCombatRound();
@@ -558,7 +557,9 @@ public final class CombatController implements VisualEffectCompletedCallback {
 	}
 
 	public void endOfCombatRound() {
+		combatTurnListeners.onCombatEnded();
 		world.model.worldData.tickWorldTime();
+		controllers.gameRoundController.resetRoundTimers();
 		controllers.actorStatsController.applyConditionsToPlayer(world.model.player, false);
 		controllers.actorStatsController.applyConditionsToMonsters(world.model.currentMap, true);
 	}