From 378d79126fb80ee79e2144f3d1bab5285a2a4a3b Mon Sep 17 00:00:00 2001
From: "marcin.sciesinski" <Marcin.Sciesinski@stash.synchronoss.net>
Date: Thu, 3 Oct 2019 11:22:25 -0700
Subject: [PATCH] Fixed bug with cards checking if a card was played in
 phase/turn

---
 .../condition/CardPlayedInCurrentPhaseCondition.java      | 8 +++++---
 .../condition/CardPlayedInCurrentTurnCondition.java       | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/condition/CardPlayedInCurrentPhaseCondition.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/condition/CardPlayedInCurrentPhaseCondition.java
index fc0bf996a..15133b996 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/condition/CardPlayedInCurrentPhaseCondition.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/condition/CardPlayedInCurrentPhaseCondition.java
@@ -18,9 +18,11 @@ public class CardPlayedInCurrentPhaseCondition implements Condition {
     @Override
     public boolean isFullfilled(LotroGame game) {
         for (EffectResult effectResult : game.getActionsEnvironment().getPhaseEffectResults()) {
-            PlayCardResult playResult = (PlayCardResult) effectResult;
-            if (filter.accepts(game, playResult.getPlayedCard()))
-                return true;
+            if (effectResult instanceof PlayCardResult) {
+                PlayCardResult playResult = (PlayCardResult) effectResult;
+                if (filter.accepts(game, playResult.getPlayedCard()))
+                    return true;
+            }
         }
 
         return false;
diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/condition/CardPlayedInCurrentTurnCondition.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/condition/CardPlayedInCurrentTurnCondition.java
index 0b166cf6c..5191d6b79 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/condition/CardPlayedInCurrentTurnCondition.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/condition/CardPlayedInCurrentTurnCondition.java
@@ -18,9 +18,11 @@ public class CardPlayedInCurrentTurnCondition implements Condition {
     @Override
     public boolean isFullfilled(LotroGame game) {
         for (EffectResult effectResult : game.getActionsEnvironment().getTurnEffectResults()) {
-            PlayCardResult playResult = (PlayCardResult) effectResult;
-            if (filter.accepts(game, playResult.getPlayedCard()))
-                return true;
+            if (effectResult instanceof PlayCardResult) {
+                PlayCardResult playResult = (PlayCardResult) effectResult;
+                if (filter.accepts(game, playResult.getPlayedCard()))
+                    return true;
+            }
         }
 
         return false;