From 9564bdcfea706715fd00e7b8bc872bbaebb04253 Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Thu, 13 Oct 2011 21:53:06 +0000
Subject: [PATCH] - Cards that play next site should be working correctly now

---
 .../com/gempukku/lotro/cards/effects/PlaySiteEffect.java   | 7 ++++++-
 .../gemp-lotr-web/src/main/webapp/includes/changeLog.html  | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PlaySiteEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PlaySiteEffect.java
index 76e73aa8e..8d5b4f634 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PlaySiteEffect.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PlaySiteEffect.java
@@ -27,7 +27,12 @@ public class PlaySiteEffect extends AbstractEffect {
     }
 
     private PhysicalCard getMatchingSite(LotroGame game) {
-        Collection<PhysicalCard> matching = Filters.filter(game.getGameState().getAdventureDeck(_playerId), game.getGameState(), game.getModifiersQuerying(), Filters.siteNumber(_siteNumber), Filters.siteBlock(_siteBlock));
+        Collection<PhysicalCard> matching;
+        if (_siteBlock != null) {
+            matching = Filters.filter(game.getGameState().getAdventureDeck(_playerId), game.getGameState(), game.getModifiersQuerying(), Filters.siteNumber(_siteNumber), Filters.siteBlock(_siteBlock));
+        } else {
+            matching = Filters.filter(game.getGameState().getAdventureDeck(_playerId), game.getGameState(), game.getModifiersQuerying(), Filters.siteNumber(_siteNumber));
+        }
         if (matching.size() > 0)
             return matching.iterator().next();
         else
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
index ae3cdd8f4..0b692bcad 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
@@ -8,6 +8,7 @@
 - Added animations to cards entering play
 - Cereborn now correctly exerts itself for his ability.
 - You can't transfer card to the same bearer ("Horn of Boromir")
+- Cards that play next site should be working correctly now
 
 <b>6 Oct. 2011</b>
 - "Hollowing of Isengard" now correctly discards itself upon use.