From 6b5de9208dee3d3ff113e43acf08b75eeef13f88 Mon Sep 17 00:00:00 2001
From: Troy Biesterfeld <troy.biesterfeld@gmail.com>
Date: Wed, 9 Jun 2021 19:08:35 -0500
Subject: [PATCH] Eomer, Keeper of Oaths shuffles deck even if no cards played

---
 .../java/com/gempukku/lotro/cards/set8/rohan/Card8_087.java   | 3 +++
 .../gempukku/lotro/logic/actions/AttachPermanentAction.java   | 4 +++-
 .../com/gempukku/lotro/logic/actions/PlayEventAction.java     | 4 +++-
 .../com/gempukku/lotro/logic/actions/PlayPermanentAction.java | 4 +++-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/rohan/Card8_087.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/rohan/Card8_087.java
index 408b676e4..33fda38d2 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/rohan/Card8_087.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/rohan/Card8_087.java
@@ -1,6 +1,7 @@
 package com.gempukku.lotro.cards.set8.rohan;
 
 import com.gempukku.lotro.logic.cardtype.AbstractCompanion;
+import com.gempukku.lotro.logic.effects.ShuffleDeckEffect;
 import com.gempukku.lotro.logic.timing.TriggerConditions;
 import com.gempukku.lotro.logic.effects.RevealTopCardsOfDrawDeckEffect;
 import com.gempukku.lotro.logic.effects.choose.ChooseAndPlayCardFromDeckEffect;
@@ -49,6 +50,8 @@ public class Card8_087 extends AbstractCompanion {
                                     new PlayAnyNumberOfCardsFromDeckEffect(action, playerId, rohanPossessions));
                         }
                     });
+            action.appendEffect(
+                    new ShuffleDeckEffect(playerId));
             return Collections.singletonList(action);
         }
         return null;
diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/AttachPermanentAction.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/AttachPermanentAction.java
index bbcdec06d..4ed44c43c 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/AttachPermanentAction.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/AttachPermanentAction.java
@@ -87,8 +87,10 @@ public class AttachPermanentAction extends AbstractCostToEffectAction {
                 game.getGameState().addCardToZone(game, _cardToAttach, Zone.VOID_FROM_HAND);
             else
                 game.getGameState().addCardToZone(game, _cardToAttach, Zone.VOID);
-            if (playedFromZone == Zone.DECK)
+            if (playedFromZone == Zone.DECK) {
+                game.getGameState().sendMessage(_cardToAttach.getOwner() + " shuffles his or her deck");
                 game.getGameState().shuffleDeck(_cardToAttach.getOwner());
+            }
         }
 
         if (!_targetChosen) {
diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/PlayEventAction.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/PlayEventAction.java
index dce4d6474..7033674da 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/PlayEventAction.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/PlayEventAction.java
@@ -78,8 +78,10 @@ public class PlayEventAction extends AbstractCostToEffectAction {
             else
                 game.getGameState().addCardToZone(game, _eventPlayed, Zone.VOID);
 
-            if (playedFromZone == Zone.DECK)
+            if (playedFromZone == Zone.DECK) {
+                game.getGameState().sendMessage(_eventPlayed.getOwner() + " shuffles his or her deck");
                 game.getGameState().shuffleDeck(_eventPlayed.getOwner());
+            }
 
             game.getGameState().eventPlayed(_eventPlayed);
         }
diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/PlayPermanentAction.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/PlayPermanentAction.java
index 3c883190b..477b56bfb 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/PlayPermanentAction.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/PlayPermanentAction.java
@@ -78,8 +78,10 @@ public class PlayPermanentAction extends AbstractCostToEffectAction {
                 game.getGameState().addCardToZone(game, _permanentPlayed, Zone.VOID_FROM_HAND);
             else
                 game.getGameState().addCardToZone(game, _permanentPlayed, Zone.VOID);
-            if (playedFromZone == Zone.DECK && !_skipShuffling)
+            if (playedFromZone == Zone.DECK && !_skipShuffling) {
+                game.getGameState().sendMessage(_permanentPlayed.getOwner() + " shuffles his or her deck");
                 game.getGameState().shuffleDeck(_permanentPlayed.getOwner());
+            }
         }
 
         if (!_discountResolved) {