diff --git a/Mage.Sets/src/mage/sets/innistrad/SharpenedPitchfork.java b/Mage.Sets/src/mage/sets/innistrad/SharpenedPitchfork.java index 0ca4b7481e1..82d64754a95 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SharpenedPitchfork.java +++ b/Mage.Sets/src/mage/sets/innistrad/SharpenedPitchfork.java @@ -30,8 +30,10 @@ package mage.sets.innistrad; import java.util.UUID; import mage.Constants; +import mage.Constants.AttachmentType; import mage.Constants.CardType; import mage.Constants.Rarity; +import mage.Constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EquippedHasSubtypeCondition; import mage.abilities.costs.mana.GenericManaCost; @@ -40,7 +42,6 @@ import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.FirstStrikeAbility; -import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; /** @@ -60,10 +61,10 @@ public class SharpenedPitchfork extends CardImpl { this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(1))); // Equipped creature has first strike. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), Constants.AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT))); // As long as equipped creature is a Human, it gets +1/+1. - this.addAbility(new ConditionalStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1), new EquippedHasSubtypeCondition("Human"), staticText)); + this.addAbility(new ConditionalStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1), new EquippedHasSubtypeCondition("Human"), staticText)); } public SharpenedPitchfork(final SharpenedPitchfork card) { diff --git a/Mage.Sets/src/mage/sets/tenth/Condemn.java b/Mage.Sets/src/mage/sets/tenth/Condemn.java index b766139e6ce..70678f665ee 100644 --- a/Mage.Sets/src/mage/sets/tenth/Condemn.java +++ b/Mage.Sets/src/mage/sets/tenth/Condemn.java @@ -52,8 +52,8 @@ public class Condemn extends CardImpl { this.expansionSetCode = "10E"; this.color.setWhite(true); this.getSpellAbility().addTarget(new TargetAttackingCreature()); - this.getSpellAbility().addEffect(new CondemnEffect()); this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(false)); + this.getSpellAbility().addEffect(new CondemnEffect()); } diff --git a/Mage.Sets/src/mage/sets/zendikar/SpreadingSeas.java b/Mage.Sets/src/mage/sets/zendikar/SpreadingSeas.java index 81dc38d8081..b85ba1a6faa 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SpreadingSeas.java +++ b/Mage.Sets/src/mage/sets/zendikar/SpreadingSeas.java @@ -131,7 +131,7 @@ class SpreadingSeasEffect extends ContinuousEffectImpl { @Override public boolean hasLayer(Layer layer) { - return layer == Layer.AbilityAddingRemovingEffects_6 || layer == layer.TypeChangingEffects_4; + return layer == Layer.AbilityAddingRemovingEffects_6 || layer == Layer.TypeChangingEffects_4; } } \ No newline at end of file diff --git a/Mage/src/mage/filter/FilterObject.java b/Mage/src/mage/filter/FilterObject.java index ae906fabed1..805cf19153b 100644 --- a/Mage/src/mage/filter/FilterObject.java +++ b/Mage/src/mage/filter/FilterObject.java @@ -30,7 +30,6 @@ package mage.filter; import java.util.ArrayList; import java.util.List; -import java.util.UUID; import mage.Constants.CardType; import mage.MageObject; import mage.ObjectColor;