diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html index a99667bfe..f40a7f346 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html @@ -1,4 +1,7 @@
+3 Dec. 2013
+- "Mumak Commander" no longer kills all the minions in its skirmish in addition to the companion.
+
27 Nov. 2013
- "Neekerbreekers' Bog" should now correctly exert minions when moving to the site.
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/raider/Card7_152.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/raider/Card7_152.java
index 01dc33fc3..19754f993 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/raider/Card7_152.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/raider/Card7_152.java
@@ -7,6 +7,7 @@ import com.gempukku.lotro.common.CardType;
import com.gempukku.lotro.common.Culture;
import com.gempukku.lotro.common.Keyword;
import com.gempukku.lotro.common.Race;
+import com.gempukku.lotro.filters.Filters;
import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.logic.actions.RequiredTriggerAction;
@@ -14,6 +15,7 @@ import com.gempukku.lotro.logic.effects.KillEffect;
import com.gempukku.lotro.logic.timing.EffectResult;
import com.gempukku.lotro.logic.timing.results.CharacterWonSkirmishResult;
+import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -46,9 +48,10 @@ public class Card7_152 extends AbstractMinion {
if (TriggerConditions.winsSkirmishInvolving(game, effectResult, self, CardType.COMPANION)
&& game.getGameState().getThreats() >= 6) {
CharacterWonSkirmishResult skirmishResult = (CharacterWonSkirmishResult) effectResult;
+ final Collection losingCompanion = Filters.filter(skirmishResult.getInvolving(), game.getGameState(), game.getModifiersQuerying(), CardType.COMPANION);
RequiredTriggerAction action = new RequiredTriggerAction(self);
action.appendEffect(
- new KillEffect(skirmishResult.getInvolving(), KillEffect.Cause.CARD_EFFECT));
+ new KillEffect(losingCompanion, KillEffect.Cause.CARD_EFFECT));
return Collections.singletonList(action);
}
return null;
diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/KillEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/KillEffect.java
index 03dcf44d3..b6b371a3a 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/KillEffect.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/KillEffect.java
@@ -15,7 +15,7 @@ import com.gempukku.lotro.logic.timing.results.KilledResult;
import java.util.*;
public class KillEffect extends AbstractSuccessfulEffect {
- private Set _cards;
+ private Collection _cards;
private Cause _cause;
public enum Cause {
@@ -26,7 +26,7 @@ public class KillEffect extends AbstractSuccessfulEffect {
this(Collections.singleton(card), cause);
}
- public KillEffect(Set cards, Cause cause) {
+ public KillEffect(Collection cards, Cause cause) {
_cards = cards;
_cause = cause;
}