From 8e6092b2179ef09cbff61e2e3ff6bb8a2e5d578d Mon Sep 17 00:00:00 2001
From: PhallenCassidy <leoplurodyn@gmail.com>
Date: Sat, 10 Mar 2018 22:45:01 -0500
Subject: [PATCH]  Reworked "Skirmish about to end" step

"Final Cry," "Loathsome," and "Sting, Bane of the Eight Legs" should be usable even if the skirmish is cancelled (per clarification on Loathsome). Added a check to allow Loathsome and Final Cry to work, even if the relevant shadow character is removed prior to the end of the skirmish
---
 .../lotro/logic/timing/actions/SkirmishPhaseAction.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/actions/SkirmishPhaseAction.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/actions/SkirmishPhaseAction.java
index 26bc3cb72..b0e5ee2a0 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/actions/SkirmishPhaseAction.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/actions/SkirmishPhaseAction.java
@@ -45,12 +45,12 @@ public class SkirmishPhaseAction extends SystemQueueAction {
                     protected void doPlayEffect(LotroGame game) {
                         if (!game.getGameState().getSkirmish().isCancelled()) {
                             insertEffect(
-                                    new ResolveSkirmishEffect(),
-                                    new TriggeringResultEffect(new SkirmishAboutToEndResult(), "Skirmish about to end"));
+                                    new ResolveSkirmishEffect());
                         }
                     }
                 });
-
+        appendEffect(
+                new TriggeringResultEffect(null, new SkirmishAboutToEndResult(shadowCharacters), "Skirmish about to end"));
         appendEffect(
                 new TriggeringResultEffect(null, new EndOfPhaseResult(Phase.SKIRMISH), "End of skirmish phase"));
         appendEffect(