diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/PlayConditions.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/PlayConditions.java index 6d72f5264..b9b5f9271 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/PlayConditions.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/PlayConditions.java @@ -255,7 +255,7 @@ public class PlayConditions { public boolean visitPhysicalCard(PhysicalCard physicalCard) { if (filter.accepts(gameState, modifiersQuerying, physicalCard) && modifiersQuerying.getVitality(gameState, physicalCard) > times - && modifiersQuerying.canTakeWounds(gameState, Collections.singleton(source), physicalCard, times)) + && modifiersQuerying.canTakeWounds(gameState, (source != null)?Collections.singleton(source):Collections.emptySet(), physicalCard, times)) _woundableCount++; return _woundableCount >= count; } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java index f2441fa10..c325dce28 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java @@ -411,7 +411,7 @@ public class Filters { return new Filter() { @Override public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) { - return modifiersQuerying.canTakeWounds(gameState, Collections.singleton(woundSource), physicalCard, count) && modifiersQuerying.getVitality(gameState, physicalCard) >= count; + return modifiersQuerying.canTakeWounds(gameState, (woundSource != null)?Collections.singleton(woundSource):Collections.emptySet(), physicalCard, count) && modifiersQuerying.getVitality(gameState, physicalCard) >= count; } }; } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/WoundCharactersEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/WoundCharactersEffect.java index 84d91c8a5..c85fbc2c5 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/WoundCharactersEffect.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/WoundCharactersEffect.java @@ -15,7 +15,7 @@ import java.util.Collection; import java.util.Collections; public class WoundCharactersEffect extends AbstractPreventableCardEffect { - private Collection _sources; + private Collection _sources = Collections.emptySet(); private String _sourceText; public WoundCharactersEffect(Collection sources, Filterable... filter) {