From a5b0e4a2ea2b03c36ed5ab025c9c255649192634 Mon Sep 17 00:00:00 2001
From: moomarc <moomarc@cardforge.org>
Date: Wed, 22 May 2013 06:07:17 +0000
Subject: [PATCH] - UntilEndOfCombat durations were continuing if combat ended
 early via Time Stop etc so added an extra catch in cleanup.

---
 src/main/java/forge/game/phase/PhaseHandler.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/forge/game/phase/PhaseHandler.java b/src/main/java/forge/game/phase/PhaseHandler.java
index 7669c38a21a..b5757d6cfb4 100644
--- a/src/main/java/forge/game/phase/PhaseHandler.java
+++ b/src/main/java/forge/game/phase/PhaseHandler.java
@@ -378,6 +378,7 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable {
                     c.onCleanupPhase(playerTurn);
                 }
 
+                game.getEndOfCombat().executeUntil(); //Repeat here in case Time Stop et. al. ends combat early
                 game.getEndOfTurn().executeUntil();
 
                 for (Player player : game.getPlayers()) {