diff --git a/Mage.Common/src/main/java/mage/utils/MageVersion.java b/Mage.Common/src/main/java/mage/utils/MageVersion.java index 4a6adeb7dc4..749041fff54 100644 --- a/Mage.Common/src/main/java/mage/utils/MageVersion.java +++ b/Mage.Common/src/main/java/mage/utils/MageVersion.java @@ -41,7 +41,7 @@ public class MageVersion implements Serializable, Comparable { public final static int MAGE_VERSION_MAJOR = 1; public final static int MAGE_VERSION_MINOR = 4; public final static int MAGE_VERSION_PATCH = 26; - public final static String MAGE_VERSION_MINOR_PATCH = "V11c"; + public final static String MAGE_VERSION_MINOR_PATCH = "V11d"; public final static String MAGE_VERSION_INFO = ""; private final int major; diff --git a/Mage.Sets/src/mage/cards/a/AuraGraft.java b/Mage.Sets/src/mage/cards/a/AuraGraft.java index 80970884c70..09cc30a020e 100644 --- a/Mage.Sets/src/mage/cards/a/AuraGraft.java +++ b/Mage.Sets/src/mage/cards/a/AuraGraft.java @@ -57,7 +57,7 @@ import mage.util.TargetAddress; public class AuraGraft extends CardImpl { public AuraGraft(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{U}"); // Gain control of target Aura that's attached to a permanent. Attach it to another permanent it can enchant. FilterPermanent filter = new FilterPermanent("Aura that's attached to a permanent"); @@ -81,7 +81,6 @@ public class AuraGraft extends CardImpl { } } - class AttachedToPermanentPredicate implements ObjectPlayerPredicate> { public AttachedToPermanentPredicate() { @@ -95,6 +94,7 @@ class AttachedToPermanentPredicate implements ObjectPlayerPredicate> { + protected Permanent aura; public PermanentCanBeAttachedToPredicate(Permanent aura) { @@ -102,6 +102,7 @@ class PermanentCanBeAttachedToPredicate implements ObjectPlayerPredicate input, Game game) { Permanent potentialAttachment = input.getObject(); for (TargetAddress addr : TargetAddress.walk(aura)) { @@ -130,7 +131,7 @@ class MoveTargetAuraEffect extends OneShotEffect { } @Override - public boolean apply(Game game, Ability source){ + public boolean apply(Game game, Ability source) { Permanent enchantment = game.getPermanent(targetPointer.getFirst(game, source)); if (enchantment == null) { return false; @@ -150,10 +151,10 @@ class MoveTargetAuraEffect extends OneShotEffect { Target target = new TargetPermanent(filter); target.setNotTarget(true); if (target.canChoose(oldAttachment.getId(), controller.getId(), game) - && controller.choose(outcome, target, oldAttachment.getId(), game)) { + && controller.choose(outcome, target, oldAttachment.getId(), game)) { Permanent newAttachment = game.getPermanent(target.getFirstTarget()); - if (newAttachment != null && - oldAttachment.removeAttachment(enchantment.getId(), game)) { + if (newAttachment != null + && oldAttachment.removeAttachment(enchantment.getId(), game)) { newAttachment.addAttachment(enchantment.getId(), game); game.informPlayers(enchantment.getLogName() + " was unattached from " + oldAttachment.getLogName() + " and attached to " + newAttachment.getLogName()); return true; diff --git a/Mage/src/main/java/mage/cards/repository/CardRepository.java b/Mage/src/main/java/mage/cards/repository/CardRepository.java index db9f2bf33f4..857fd8e6b48 100644 --- a/Mage/src/main/java/mage/cards/repository/CardRepository.java +++ b/Mage/src/main/java/mage/cards/repository/CardRepository.java @@ -58,7 +58,7 @@ public enum CardRepository { // raise this if db structure was changed private static final long CARD_DB_VERSION = 51; // raise this if new cards were added to the server - private static final long CARD_CONTENT_VERSION = 99; + private static final long CARD_CONTENT_VERSION = 100; private Dao cardDao; private Set classNames; diff --git a/Mage/src/main/java/mage/game/combat/Combat.java b/Mage/src/main/java/mage/game/combat/Combat.java index f6a76d8aefc..617a29c50cb 100644 --- a/Mage/src/main/java/mage/game/combat/Combat.java +++ b/Mage/src/main/java/mage/game/combat/Combat.java @@ -38,7 +38,6 @@ import mage.abilities.keyword.special.JohanVigilanceAbility; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.StaticFilters; -import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreatureForCombatBlock; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; @@ -655,7 +654,7 @@ public class Combat implements Serializable, Copyable { Map> mustBeBlockedByAtLeastOne = new HashMap<>(); // check mustBlock requirements of creatures from opponents of attacking player - for (Permanent creature : game.getBattlefield().getActivePermanents(new FilterControlledCreaturePermanent(), player.getId(), game)) { + for (Permanent creature : game.getBattlefield().getActivePermanents(StaticFilters.FILTER_PERMANENT_CREATURES_CONTROLLED, player.getId(), game)) { // creature is controlled by an opponent of the attacker if (opponents.contains(creature.getControllerId())) {