From a0e1eaf1d7614f6f04ec4b2adf59710efb7a7f19 Mon Sep 17 00:00:00 2001 From: Sloth Date: Sat, 24 Nov 2012 13:56:58 +0000 Subject: [PATCH] - Fixed Alpha Status. --- src/main/java/forge/GameActionUtil.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/forge/GameActionUtil.java b/src/main/java/forge/GameActionUtil.java index 30a2492633b..763cad5e393 100644 --- a/src/main/java/forge/GameActionUtil.java +++ b/src/main/java/forge/GameActionUtil.java @@ -1019,9 +1019,10 @@ public final class GameActionUtil { @Override public void execute() { - final List alphaStatuses = CardLists.filter(Singletons.getModel().getGame().getCardsIn(ZoneType.Battlefield), CardPredicates.nameEquals("Alpha Status")); - - final List allCreatures = CardLists.filter(Singletons.getModel().getGame().getCardsIn(ZoneType.Battlefield), Presets.CREATURES); + final List alphaStatuses = CardLists.filter(Singletons.getModel().getGame() + .getCardsIn(ZoneType.Battlefield), CardPredicates.nameEquals("Alpha Status")); + final List allCreatures = CardLists.filter(Singletons.getModel().getGame() + .getCardsIn(ZoneType.Battlefield), Presets.CREATURES); for (int i = 0; i < this.previouslyPumped.size(); i++) { this.previouslyPumped.get(i).addSemiPermanentAttackBoost(0 - this.previouslyPumpedValue.get(i)); @@ -1032,10 +1033,13 @@ public final class GameActionUtil { for (final Card alpha : alphaStatuses) { final Card enchanted = alpha.getEnchantingCard(); + if (enchanted == null) { + continue; + } int totalbuff = 0; for (final Card othercreat : allCreatures) { - if (enchanted != othercreat && othercreat.sharesCreatureTypeWith(enchanted)) { + if (!enchanted.equals(othercreat) && othercreat.sharesCreatureTypeWith(enchanted)) { totalbuff += 2; } }