- 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

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