diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Standard.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Standard.java index 1e7377fa5e1..65c1667d00a 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Standard.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Standard.java @@ -70,5 +70,6 @@ public class Standard extends Constructed { banned.add("Emrakul, the Promised End"); banned.add("Reflector Mage"); banned.add("Smuggler's Copter"); + banned.add("Felidar Guardian"); } } diff --git a/Mage.Sets/src/mage/cards/b/BrunaTheFadingLight.java b/Mage.Sets/src/mage/cards/b/BrunaTheFadingLight.java index 48e1e8d033f..72ce3556cab 100644 --- a/Mage.Sets/src/mage/cards/b/BrunaTheFadingLight.java +++ b/Mage.Sets/src/mage/cards/b/BrunaTheFadingLight.java @@ -27,6 +27,7 @@ */ package mage.cards.b; +import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -47,8 +48,6 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInYourGraveyard; -import java.util.UUID; - /** * * @author fireshoes @@ -85,7 +84,7 @@ public class BrunaTheFadingLight extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // (Melds with Gisela, the Broken Blade.) - this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("(Melds with Gisela, the Broken Blade.)"))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("(Melds with Gisela, the Broken Blade.)"))); } public BrunaTheFadingLight(final BrunaTheFadingLight card) { diff --git a/Mage.Sets/src/mage/cards/h/HanweirGarrison.java b/Mage.Sets/src/mage/cards/h/HanweirGarrison.java index db4bc57659b..4cf5d31bc1d 100644 --- a/Mage.Sets/src/mage/cards/h/HanweirGarrison.java +++ b/Mage.Sets/src/mage/cards/h/HanweirGarrison.java @@ -57,7 +57,7 @@ public class HanweirGarrison extends CardImpl { this.addAbility(new AttacksTriggeredAbility(new CreateTokenEffect(new RedHumanToken(), 2, true, true), false)); // (Melds with Hanweir Battlements.) - this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("(Melds with Hannweir Battlements.)"))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("(Melds with Hannweir Battlements.)"))); } public HanweirGarrison(final HanweirGarrison card) { diff --git a/Mage.Sets/src/mage/cards/m/MidnightScavengers.java b/Mage.Sets/src/mage/cards/m/MidnightScavengers.java index 88b99e44a01..0d7cbb4057f 100644 --- a/Mage.Sets/src/mage/cards/m/MidnightScavengers.java +++ b/Mage.Sets/src/mage/cards/m/MidnightScavengers.java @@ -27,9 +27,9 @@ */ package mage.cards.m; +import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.constants.ComparisonType; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.InfoEffect; @@ -37,14 +37,13 @@ import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.ComparisonType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.target.Target; import mage.target.common.TargetCardInYourGraveyard; -import java.util.UUID; - /** * * @author fireshoes @@ -71,7 +70,7 @@ public class MidnightScavengers extends CardImpl { this.addAbility(ability); // (Melds with Graf Rats.) - this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("(Melds with Graf Rats.)"))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("(Melds with Graf Rats.)"))); } public MidnightScavengers(final MidnightScavengers card) { diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/LandTypeChangingEffectsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/LandTypeChangingEffectsTest.java index e297a911596..091484c1128 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/LandTypeChangingEffectsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/LandTypeChangingEffectsTest.java @@ -135,6 +135,9 @@ public class LandTypeChangingEffectsTest extends CardTestPlayerBase { String bloodmoon = "Blood Moon"; String canopyvista = "Canopy Vista"; + /* + NOTE: this test is currently failing due to bug in code. See issue #3072 + */ @Test public void testBloodMoonBeforeUrborg() { // Blood Moon 2R @@ -164,6 +167,9 @@ public class LandTypeChangingEffectsTest extends CardTestPlayerBase { Assert.assertTrue("The mana the land can produce should be [{R}] but it's " + playerB.getManaAvailable(currentGame).toString(), playerB.getManaAvailable(currentGame).toString().equals("[{R}]")); } + /* + NOTE: this test is currently failing due to bug in code. See issue #3072 + */ @Test public void testBloodMoonAfterUrborg() { // Blood Moon 2R diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/FluctuatorTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/FluctuatorTest.java index 98f4100f9a9..eec83a8069f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/FluctuatorTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/FluctuatorTest.java @@ -38,8 +38,8 @@ import org.mage.test.serverside.base.CardTestPlayerBase; public class FluctuatorTest extends CardTestPlayerBase { /** - * NOTE: As of 4/19/2017 this test is failing due to a bug in code. See - * issue #3148 + * NOTE: As of 4/19/2017 this test is failing due to a bug in code. + * See issue #3148 * * Fluctuator makes 'Akroma's Vengeance' cyclic cost reduced to {1} Test it * with one Plains on battlefield. @@ -93,8 +93,8 @@ public class FluctuatorTest extends CardTestPlayerBase { } /** - * NOTE: As of 4/19/2017 this test is failing due to a bug in code. See - * issue #3148 + * NOTE: As of 4/19/2017 this test is failing due to a bug in code. + * See issue #3148 * * Test 2 Fluctuators reduce cycling cost up to 4. */