From 62db7ae72fd4ea6f91ab551555485128dfe868f6 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Fri, 16 Mar 2018 20:11:10 +0100
Subject: [PATCH] * Skyshrout War Beast - Fixed wrong P/T calculation because
 of wrong land filter.

---
 Mage.Sets/src/mage/cards/s/SkyshroudWarBeast.java | 9 +++------
 Mage/src/main/java/mage/filter/StaticFilters.java | 8 ++++++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/s/SkyshroudWarBeast.java b/Mage.Sets/src/mage/cards/s/SkyshroudWarBeast.java
index 25705180cd..7972d4fe37 100644
--- a/Mage.Sets/src/mage/cards/s/SkyshroudWarBeast.java
+++ b/Mage.Sets/src/mage/cards/s/SkyshroudWarBeast.java
@@ -36,7 +36,6 @@ import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
 import mage.abilities.effects.ContinuousEffectImpl;
 import mage.abilities.effects.common.ChooseOpponentEffect;
-import mage.constants.SubType;
 import mage.abilities.keyword.TrampleAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -45,9 +44,9 @@ import mage.constants.Duration;
 import mage.constants.Layer;
 import mage.constants.Outcome;
 import mage.constants.SubLayer;
+import mage.constants.SubType;
 import mage.constants.Zone;
-import mage.filter.common.FilterLandPermanent;
-import mage.filter.predicate.permanent.ControllerIdPredicate;
+import mage.filter.StaticFilters;
 import mage.game.Game;
 import mage.players.Player;
 
@@ -107,9 +106,7 @@ class SkyshroudWarBeastEffect extends ContinuousEffectImpl {
             MageObject target = game.getObject(source.getSourceId());
             if (target != null) {
                 UUID playerId = (UUID) game.getState().getValue(source.getSourceId().toString() + ChooseOpponentEffect.VALUE_KEY);
-                FilterLandPermanent filter = new FilterLandPermanent();
-                filter.add(new ControllerIdPredicate(playerId));
-                int number = new PermanentsOnBattlefieldCount(filter).calculate(game, source, this);
+                int number = new PermanentsOnBattlefieldCount(StaticFilters.FILTER_LANDS_NONBASIC).calculate(game, source, this);
                 target.getPower().setValue(number);
                 target.getToughness().setValue(number);
                 return true;
diff --git a/Mage/src/main/java/mage/filter/StaticFilters.java b/Mage/src/main/java/mage/filter/StaticFilters.java
index e6ccc99657..a9894b4f59 100644
--- a/Mage/src/main/java/mage/filter/StaticFilters.java
+++ b/Mage/src/main/java/mage/filter/StaticFilters.java
@@ -179,13 +179,13 @@ public final class StaticFilters {
 
     static {
         FILTER_CONTROLLED_CREATURE.setLockedFilter(true);
-    }    
+    }
     public static final FilterControlledCreaturePermanent FILTER_CONTROLLED_CREATURES = new FilterControlledCreaturePermanent("creatures you control");
 
     static {
         FILTER_CONTROLLED_CREATURES.setLockedFilter(true);
     }
-    
+
     public static final FilterControlledCreaturePermanent FILTER_CONTROLLED_A_CREATURE = new FilterControlledCreaturePermanent("a creature you control");
 
     static {
@@ -210,11 +210,15 @@ public final class StaticFilters {
     static {
         FILTER_LAND.setLockedFilter(true);
     }
+
     public static final FilterLandPermanent FILTER_LANDS = new FilterLandPermanent("lands");
 
     static {
         FILTER_LANDS.setLockedFilter(true);
     }
+
+    public static final FilterLandPermanent FILTER_LANDS_NONBASIC = FilterLandPermanent.nonbasicLands();
+
     public static final FilterBasicLandCard FILTER_BASIC_LAND_CARD = new FilterBasicLandCard();
 
     static {