From b64ae17e861b27b66dbc2cbc0fb319c9379fc815 Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Tue, 25 Oct 2011 22:27:24 +0000
Subject: [PATCH] - "Vengeance" now correctly counts cards attached to oposing
 character. - "Cliffs of Emyn Muil" is correctly wounding minions skirmishing
 Hobbit companion now.

---
 .../com/gempukku/lotro/cards/set4/isengard/Card4_208.java     | 2 +-
 .../java/com/gempukku/lotro/cards/set4/shire/Card4_299.java   | 2 +-
 .../main/java/com/gempukku/lotro/server/ServerResource.java   | 4 +++-
 .../gemp-lotr-web/src/main/webapp/includes/changeLog.html     | 4 ++++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_208.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_208.java
index 24cb7300f..e77822d4d 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_208.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_208.java
@@ -33,7 +33,7 @@ public class Card4_208 extends AbstractOldEvent {
                 new ChooseActiveCardEffect(self, playerId, "Choose an ISENGARD tracker", Filters.culture(Culture.ISENGARD), Filters.keyword(Keyword.TRACKER)) {
                     @Override
                     protected void cardSelected(LotroGame game, PhysicalCard card) {
-                        int bonus = 2 * Filters.countSpottable(game.getGameState(), game.getModifiersQuerying(), Filters.attachedTo(Filters.inSkirmishAgainst(Filters.sameCard(self))));
+                        int bonus = 2 * Filters.countSpottable(game.getGameState(), game.getModifiersQuerying(), Filters.attachedTo(Filters.inSkirmishAgainst(card)));
                         action.insertEffect(
                                 new AddUntilEndOfPhaseModifierEffect(
                                         new StrengthModifier(self, Filters.sameCard(card), bonus), Phase.SKIRMISH));
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_299.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_299.java
index a2ecd4652..d82867829 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_299.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_299.java
@@ -62,7 +62,7 @@ public class Card4_299 extends AbstractPermanent {
             action.appendCost(
                     new DiscardCardsFromPlayEffect(self, self));
             action.appendEffect(
-                    new ChooseAndWoundCharactersEffect(action, playerId, 1, 1, Filters.inSkirmishAgainst(Filters.sameCard(self.getAttachedTo()))));
+                    new ChooseAndWoundCharactersEffect(action, playerId, 1, 1, Filters.inSkirmishAgainst(Race.HOBBIT, CardType.COMPANION)));
             return Collections.singletonList(action);
         }
         return null;
diff --git a/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/ServerResource.java b/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/ServerResource.java
index 123e51765..f8948f9f5 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/ServerResource.java
+++ b/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/ServerResource.java
@@ -511,7 +511,9 @@ public class ServerResource {
                     Element card = doc.createElement("card");
                     card.setAttribute("count", String.valueOf(item.getCount()));
                     card.setAttribute("blueprintId", blueprintId);
-                    card.setAttribute("side", item.getCardBlueprint().getSide().toString());
+                    Side side = item.getCardBlueprint().getSide();
+                    if (side != null)
+                        card.setAttribute("side", side.toString());
                     collectionElem.appendChild(card);
                 } else {
                     Element pack = doc.createElement("pack");
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 0cdda705a..25a022eb1 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
@@ -1,4 +1,8 @@
 <pre style="font-size:80%">
+<b>24 Oct. 2011</b>
+- "Vengeance" now correctly counts cards attached to oposing character.
+- "Cliffs of Emyn Muil" is correctly wounding minions skirmishing Hobbit companion now.
+
 <b>24 Oct. 2011</b>
 - Frodo and Sam are always Ring-bound (according to rules).
 - "Resistance Becomes Unbearable" can be now played in Maneuver phase, as it's supposed to.