From cfca1e494808095cfe5754c28027685cd955a82d Mon Sep 17 00:00:00 2001
From: Evan Kranzler <theelk801@gmail.com>
Date: Sun, 13 Jan 2019 20:42:03 -0500
Subject: [PATCH] fixed Lumbering Battlement implementation

---
 .../src/mage/cards/l/LumberingBattlement.java | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/l/LumberingBattlement.java b/Mage.Sets/src/mage/cards/l/LumberingBattlement.java
index 4b08d51a6d..8db020a7dc 100644
--- a/Mage.Sets/src/mage/cards/l/LumberingBattlement.java
+++ b/Mage.Sets/src/mage/cards/l/LumberingBattlement.java
@@ -19,7 +19,9 @@ import mage.constants.SubType;
 import mage.filter.FilterPermanent;
 import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.predicate.Predicates;
+import mage.filter.predicate.permanent.AnotherPredicate;
 import mage.filter.predicate.permanent.TokenPredicate;
+import mage.game.ExileZone;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
@@ -53,8 +55,8 @@ public final class LumberingBattlement extends CardImpl {
 
         // Lumbering Battlement gets +2/+2 for each card exiled with it.
         this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(
-                LumberinBattlementValue.instance,
-                LumberinBattlementValue.instance,
+                LumberingBattlementValue.instance,
+                LumberingBattlementValue.instance,
                 Duration.WhileOnBattlefield
         ).setText("{this} gets +2/+2 for each card exiled with it.")));
     }
@@ -72,10 +74,11 @@ public final class LumberingBattlement extends CardImpl {
 class LumberingBattlementEffect extends OneShotEffect {
 
     private static final FilterPermanent filter
-            = new FilterControlledCreaturePermanent("nontoken creatures");
+            = new FilterControlledCreaturePermanent("other nontoken creatures");
 
     static {
         filter.add(Predicates.not(TokenPredicate.instance));
+        filter.add(AnotherPredicate.instance);
     }
 
     LumberingBattlementEffect() {
@@ -119,15 +122,26 @@ class LumberingBattlementEffect extends OneShotEffect {
     }
 }
 
-enum LumberinBattlementValue implements DynamicValue {
+enum LumberingBattlementValue implements DynamicValue {
     instance;
 
     @Override
     public int calculate(Game game, Ability sourceAbility, Effect effect) {
+        if (sourceAbility == null) {
+            return 0;
+        }
+        ExileZone exileZone = game.getExile().getExileZone(CardUtil.getExileZoneId(
+                game, sourceAbility.getSourceId(),
+                sourceAbility.getSourceObjectZoneChangeCounter()
+        ));
+        if (exileZone == null) {
+            exileZone = game.getExile().getExileZone(CardUtil.getCardExileZoneId(game, sourceAbility));
+        }
+        if (exileZone == null) {
+            return 0;
+        }
         int counter = 0;
-        for (UUID cardId : game.getExile().getExileZone(CardUtil.getExileZoneId(
-                game, sourceAbility.getSourceId(), sourceAbility.getSourceObjectZoneChangeCounter()
-        ))) {
+        for (UUID cardId : exileZone) {
             Card card = game.getCard(cardId);
             if (card != null) {
                 counter++;