- Fixed "Trapped and Alone" and all other cards that remove keyword bonuses granted by other cards.

gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/CancelKeywordBonusModifier.java

@@ -12,7 +12,7 @@ public class CancelKeywordBonusModifier extends AbstractModifier {
     private Keyword _keyword;
 
     public CancelKeywordBonusModifier(PhysicalCard source, Keyword keyword, Filter affectFilter) {
-        super(source, "Cancel " + keyword.getHumanReadable() + " keyword", affectFilter, new ModifierEffect[]{ModifierEffect.STRENGTH_MODIFIER});
+        super(source, "Cancel " + keyword.getHumanReadable() + " keyword", affectFilter, new ModifierEffect[]{ModifierEffect.KEYWORD_MODIFIER});
         _keyword = keyword;
     }
 

gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java

@@ -470,8 +470,6 @@ public class Filters {
     }
 
     private static Filter changeToFilter(Filterable filter) {
-        if (filter == null)
-            return null;
         if (filter instanceof Filter)
             return (Filter) filter;
         else if (filter instanceof PhysicalCard)

gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/AbstractModifier.java

@@ -27,7 +27,7 @@ public abstract class AbstractModifier implements Modifier {
     protected AbstractModifier(PhysicalCard source, String text, Filterable affectFilter, Condition condition, ModifierEffect[] effects) {
         _physicalCard = source;
         _text = text;
-        _affectFilter = Filters.and(affectFilter);
+        _affectFilter = (affectFilter != null) ? Filters.and(affectFilter) : null;
         _condition = condition;
         _effects = effects;
     }

gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/DefaultCardCollection.java

@@ -62,7 +62,7 @@ public class DefaultCardCollection implements MutableCardCollection {
                     if (cardTypes == null || cardTypes.contains(blueprint.getCardType()))
                         if (cultures == null || cultures.contains(blueprint.getCulture()))
                             if (containsAllKeywords(blueprint, keywords))
-                                if (siteNumber == null || blueprint.getSiteNumber() == siteNumber.intValue())
+                                if (siteNumber == null || blueprint.getSiteNumber() == siteNumber)
                                     result.add(new Item(Item.Type.CARD, count, blueprintId, blueprint));
             }
         }

gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html

@@ -5,6 +5,7 @@
 - Added Mulligan rule to "Community..." formats and "Towers Standard" format.
 - Added revealing effect to all cards, for now the revealed cards will be only shown in the log, until I figure out
 something better.
+- Fixed "Trapped and Alone" and all other cards that remove keyword bonuses granted by other cards.
 
 <b>17 Oct. 2011</b>
 - "Coming for the Ring" is no longed considered Free People card by the game.