* Used by the AI to calculate what mana it needs to obtain for a spell to become playable.
*
* @param avail the mana available to pay the cost
- * @return the total mana needed to pay this given the available mana passed in as a {@link Mana} object.
+ * @return the total mana needed to pay this given the available mana passed in as a {@link Mana} object.
*/
public Mana needed(final Mana avail) {
Mana compare = avail.copy();
@@ -1239,19 +1241,19 @@ public class Mana implements Comparable
* See tests ManaTest.moreValuableManaTest for several examples
- *
+ *
* Examples:
- * {1} and {R} -> {R}
- * {2} and {1}{W} -> {1}{W}
- * {3} and {1}{W} -> {1}{W}
- * {1}{W}{R} and {G}{W}{R} -> {G}{W}{R}
- * {G}{W}{R} and {G}{W}{R} -> null
- * {G}{W}{B} and {G}{W}{R} -> null
- * {C} and {ANY} -> null
+ * {1} and {R} -> {R}
+ * {2} and {1}{W} -> {1}{W}
+ * {3} and {1}{W} -> {1}{W}
+ * {1}{W}{R} and {G}{W}{R} -> {G}{W}{R}
+ * {G}{W}{R} and {G}{W}{R} -> null
+ * {G}{W}{B} and {G}{W}{R} -> null
+ * {C} and {ANY} -> null
*
- * @param mana1 The 1st mana to compare.
- * @param mana2 The 2nd mana to compare.
- * @return The greater of the two manas, or null if they're the same OR they cannot be compared
+ * @param mana1 The 1st mana to compare.
+ * @param mana2 The 2nd mana to compare.
+ * @return The greater of the two manas, or null if they're the same OR they cannot be compared
*/
public static Mana getMoreValuableMana(final Mana mana1, final Mana mana2) {
if (mana1.equals(mana2)) {
@@ -1279,8 +1281,8 @@ public class Mana implements Comparable
* Uses no stack
- *
+ *
* 11/4/2015: In a multiplayer game, if Grasp of Fate's owner leaves the game,
* the exiled cards will return to the battlefield. Because the one-shot effect
* that returns the cards isn't an ability that goes on the stack, it won't
@@ -42,7 +42,7 @@ public class OnLeaveReturnExiledAbility extends DelayedTriggeredAbility {
this.setRuleVisible(false);
}
- public OnLeaveReturnExiledAbility(final OnLeaveReturnExiledAbility ability) {
+ protected OnLeaveReturnExiledAbility(final OnLeaveReturnExiledAbility ability) {
super(ability);
}
@@ -78,7 +78,7 @@ class ReturnExiledPermanentsEffect extends OneShotEffect {
this.staticText = "Return exiled permanents";
}
- public ReturnExiledPermanentsEffect(final ReturnExiledPermanentsEffect effect) {
+ protected ReturnExiledPermanentsEffect(final ReturnExiledPermanentsEffect effect) {
super(effect);
this.zone = effect.zone;
}
diff --git a/Mage/src/main/java/mage/abilities/common/delayed/PactDelayedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/delayed/PactDelayedTriggeredAbility.java
index 89be8ce8ed6..14d30913eb5 100644
--- a/Mage/src/main/java/mage/abilities/common/delayed/PactDelayedTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/delayed/PactDelayedTriggeredAbility.java
@@ -49,7 +49,7 @@ class PactEffect extends OneShotEffect {
staticText = "pay " + cost.getText() + ". If you don't, you lose the game";
}
- public PactEffect(final PactEffect effect) {
+ protected PactEffect(final PactEffect effect) {
super(effect);
this.cost = effect.cost.copy();
}
diff --git a/Mage/src/main/java/mage/abilities/common/delayed/WhenTargetDiesDelayedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/delayed/WhenTargetDiesDelayedTriggeredAbility.java
index b6de0ec2829..9fb75825cde 100644
--- a/Mage/src/main/java/mage/abilities/common/delayed/WhenTargetDiesDelayedTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/delayed/WhenTargetDiesDelayedTriggeredAbility.java
@@ -33,7 +33,7 @@ public class WhenTargetDiesDelayedTriggeredAbility extends DelayedTriggeredAbili
setTriggerPhrase("When that creature dies" + (duration == Duration.EndOfTurn ? " this turn, " : ", "));
}
- public WhenTargetDiesDelayedTriggeredAbility(final WhenTargetDiesDelayedTriggeredAbility ability) {
+ protected WhenTargetDiesDelayedTriggeredAbility(final WhenTargetDiesDelayedTriggeredAbility ability) {
super(ability);
this.mor = ability.mor;
this.setTargetPointer = ability.setTargetPointer;
diff --git a/Mage/src/main/java/mage/abilities/costs/AlternativeCostSourceAbility.java b/Mage/src/main/java/mage/abilities/costs/AlternativeCostSourceAbility.java
index 3785d336293..41b8f228473 100644
--- a/Mage/src/main/java/mage/abilities/costs/AlternativeCostSourceAbility.java
+++ b/Mage/src/main/java/mage/abilities/costs/AlternativeCostSourceAbility.java
@@ -77,7 +77,7 @@ public class AlternativeCostSourceAbility extends StaticAbility implements Alter
this.dynamicCost = dynamicCost;
}
- public AlternativeCostSourceAbility(final AlternativeCostSourceAbility ability) {
+ protected AlternativeCostSourceAbility(final AlternativeCostSourceAbility ability) {
super(ability);
this.alternateCosts = ability.alternateCosts;
this.condition = ability.condition;
diff --git a/Mage/src/main/java/mage/abilities/costs/CompositeCost.java b/Mage/src/main/java/mage/abilities/costs/CompositeCost.java
index 5f9182f2938..4f17310d730 100644
--- a/Mage/src/main/java/mage/abilities/costs/CompositeCost.java
+++ b/Mage/src/main/java/mage/abilities/costs/CompositeCost.java
@@ -18,7 +18,7 @@ public class CompositeCost implements Cost {
this.description = description;
}
- public CompositeCost(final CompositeCost cost) {
+ protected CompositeCost(final CompositeCost cost) {
this.firstCost = cost.firstCost.copy();
this.secondCost = cost.secondCost.copy();
this.description = cost.description;
diff --git a/Mage/src/main/java/mage/abilities/costs/CostImpl.java b/Mage/src/main/java/mage/abilities/costs/CostImpl.java
index 45da8d46035..4674769db6d 100644
--- a/Mage/src/main/java/mage/abilities/costs/CostImpl.java
+++ b/Mage/src/main/java/mage/abilities/costs/CostImpl.java
@@ -20,7 +20,7 @@ public abstract class CostImpl implements Cost {
targets = new Targets();
}
- public CostImpl(final CostImpl cost) {
+ protected CostImpl(final CostImpl cost) {
this.id = cost.id;
this.text = cost.text;
this.paid = cost.paid;
diff --git a/Mage/src/main/java/mage/abilities/costs/OptionalAdditionalCostImpl.java b/Mage/src/main/java/mage/abilities/costs/OptionalAdditionalCostImpl.java
index 432fae5bc15..763dc76140e 100644
--- a/Mage/src/main/java/mage/abilities/costs/OptionalAdditionalCostImpl.java
+++ b/Mage/src/main/java/mage/abilities/costs/OptionalAdditionalCostImpl.java
@@ -29,7 +29,7 @@ public class OptionalAdditionalCostImpl extends CostsImpl
* this.getSpellAbility().addWatcher(new AttackedThisTurnWatcher());
*
* @author LevelX2
@@ -24,7 +25,7 @@ public class UntapAllThatAttackedEffect extends OneShotEffect {
staticText = "Untap all creatures that attacked this turn";
}
- public UntapAllThatAttackedEffect(final UntapAllThatAttackedEffect effect) {
+ protected UntapAllThatAttackedEffect(final UntapAllThatAttackedEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/UntapAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/UntapAttachedEffect.java
index 5e0ea9c0b6a..b80597e3f03 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/UntapAttachedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/UntapAttachedEffect.java
@@ -9,7 +9,6 @@ import mage.game.permanent.Permanent;
import mage.util.CardUtil;
/**
- *
* @author LevelX
*/
public class UntapAttachedEffect extends OneShotEffect {
@@ -23,7 +22,7 @@ public class UntapAttachedEffect extends OneShotEffect {
staticText = "untap " + CardUtil.getTextWithFirstCharLowerCase(attachmentType.verb()) + ' ' + name;
}
- public UntapAttachedEffect(final UntapAttachedEffect effect) {
+ protected UntapAttachedEffect(final UntapAttachedEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/UntapLandsEffect.java b/Mage/src/main/java/mage/abilities/effects/common/UntapLandsEffect.java
index 159f3bfad36..4b7e930dc14 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/UntapLandsEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/UntapLandsEffect.java
@@ -1,6 +1,7 @@
package mage.abilities.effects.common;
import java.util.UUID;
+
import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
import mage.constants.Outcome;
@@ -26,6 +27,7 @@ public class UntapLandsEffect extends OneShotEffect {
filterControlled.add(TappedPredicate.TAPPED);
filterControlled.add(TargetController.YOU.getControllerPredicate());
}
+
private final FilterLandPermanent filter;
private final int amount;
private final boolean upTo;
@@ -46,7 +48,7 @@ public class UntapLandsEffect extends OneShotEffect {
staticText = "untap " + (upTo ? "up to " : "") + CardUtil.numberToText(amount, staticText) + " lands" + (onlyControlled ? " you control" : "");
}
- public UntapLandsEffect(final UntapLandsEffect effect) {
+ protected UntapLandsEffect(final UntapLandsEffect effect) {
super(effect);
this.amount = effect.amount;
this.upTo = effect.upTo;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/UntapSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/UntapSourceEffect.java
index 1327ca49d25..d9a1f02e3a0 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/UntapSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/UntapSourceEffect.java
@@ -8,7 +8,6 @@ import mage.game.Game;
import mage.game.permanent.Permanent;
/**
- *
* @author Loki
*/
public class UntapSourceEffect extends OneShotEffect {
@@ -18,7 +17,7 @@ public class UntapSourceEffect extends OneShotEffect {
staticText = "untap {this}";
}
- public UntapSourceEffect(final UntapSourceEffect effect) {
+ protected UntapSourceEffect(final UntapSourceEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/UntapTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/UntapTargetEffect.java
index 6e8756a27d6..a0a9719b7af 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/UntapTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/UntapTargetEffect.java
@@ -27,7 +27,7 @@ public class UntapTargetEffect extends OneShotEffect {
}
}
- public UntapTargetEffect(final UntapTargetEffect effect) {
+ protected UntapTargetEffect(final UntapTargetEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/WinGameSourceControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/WinGameSourceControllerEffect.java
index 9d845fd203b..a19a5952b20 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/WinGameSourceControllerEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/WinGameSourceControllerEffect.java
@@ -9,7 +9,6 @@ import mage.game.Game;
import mage.players.Player;
/**
- *
* @author plopman
*/
@@ -21,7 +20,7 @@ public class WinGameSourceControllerEffect extends OneShotEffect {
this.staticText = "you win the game";
}
- public WinGameSourceControllerEffect(final WinGameSourceControllerEffect effect) {
+ protected WinGameSourceControllerEffect(final WinGameSourceControllerEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/WishEffect.java b/Mage/src/main/java/mage/abilities/effects/common/WishEffect.java
index 8e12cb02abd..29de08c3489 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/WishEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/WishEffect.java
@@ -74,7 +74,7 @@ public class WishEffect extends OneShotEffect {
return "a face-up " + s;
}
- public WishEffect(final WishEffect effect) {
+ protected WishEffect(final WishEffect effect) {
super(effect);
this.filter = effect.filter;
this.reveal = effect.reveal;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/asthought/CanPlayCardControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/asthought/CanPlayCardControllerEffect.java
index 4826c1d419b..477566134be 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/asthought/CanPlayCardControllerEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/asthought/CanPlayCardControllerEffect.java
@@ -39,7 +39,7 @@ public class CanPlayCardControllerEffect extends AsThoughEffectImpl {
this.condition = condition;
}
- public CanPlayCardControllerEffect(final CanPlayCardControllerEffect effect) {
+ protected CanPlayCardControllerEffect(final CanPlayCardControllerEffect effect) {
super(effect);
this.mor = effect.mor;
this.playerId = effect.playerId;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/asthought/PlayFromNotOwnHandZoneAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/asthought/PlayFromNotOwnHandZoneAllEffect.java
index 5b3927f2139..265fd5610fb 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/asthought/PlayFromNotOwnHandZoneAllEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/asthought/PlayFromNotOwnHandZoneAllEffect.java
@@ -1,6 +1,7 @@
package mage.abilities.effects.common.asthought;
import java.util.UUID;
+
import mage.abilities.Ability;
import mage.abilities.effects.AsThoughEffectImpl;
import mage.cards.Card;
@@ -13,7 +14,6 @@ import mage.filter.FilterCard;
import mage.game.Game;
/**
- *
* @author LevelX2
*/
public class PlayFromNotOwnHandZoneAllEffect extends AsThoughEffectImpl {
@@ -31,7 +31,7 @@ public class PlayFromNotOwnHandZoneAllEffect extends AsThoughEffectImpl {
this.allowedCaster = allowedCaster;
}
- public PlayFromNotOwnHandZoneAllEffect(final PlayFromNotOwnHandZoneAllEffect effect) {
+ protected PlayFromNotOwnHandZoneAllEffect(final PlayFromNotOwnHandZoneAllEffect effect) {
super(effect);
this.filter = effect.filter;
this.fromZone = effect.fromZone;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/asthought/PlayFromNotOwnHandZoneTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/asthought/PlayFromNotOwnHandZoneTargetEffect.java
index 9386508f97b..8b429005615 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/asthought/PlayFromNotOwnHandZoneTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/asthought/PlayFromNotOwnHandZoneTargetEffect.java
@@ -57,7 +57,7 @@ public class PlayFromNotOwnHandZoneTargetEffect extends AsThoughEffectImpl {
this.onlyCastAllowed = onlyCastAllowed;
}
- public PlayFromNotOwnHandZoneTargetEffect(final PlayFromNotOwnHandZoneTargetEffect effect) {
+ protected PlayFromNotOwnHandZoneTargetEffect(final PlayFromNotOwnHandZoneTargetEffect effect) {
super(effect);
this.fromZone = effect.fromZone;
this.allowedCaster = effect.allowedCaster;
@@ -155,8 +155,8 @@ public class PlayFromNotOwnHandZoneTargetEffect extends AsThoughEffectImpl {
/**
* Exiles the cards and let the allowed player play them from exile for the given duration
* Supports:
- * - cards (use any side)
- * - permanents (use permanent, not permanent's card)
+ * - cards (use any side)
+ * - permanents (use permanent, not permanent's card)
*
* @param game
* @param source
diff --git a/Mage/src/main/java/mage/abilities/effects/common/asthought/YouMaySpendManaAsAnyColorToCastTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/asthought/YouMaySpendManaAsAnyColorToCastTargetEffect.java
index f4b06f3a367..b79eee13fcc 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/asthought/YouMaySpendManaAsAnyColorToCastTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/asthought/YouMaySpendManaAsAnyColorToCastTargetEffect.java
@@ -35,7 +35,7 @@ public class YouMaySpendManaAsAnyColorToCastTargetEffect extends AsThoughEffectI
this.condition = condition;
}
- public YouMaySpendManaAsAnyColorToCastTargetEffect(final YouMaySpendManaAsAnyColorToCastTargetEffect effect) {
+ protected YouMaySpendManaAsAnyColorToCastTargetEffect(final YouMaySpendManaAsAnyColorToCastTargetEffect effect) {
super(effect);
this.playerId = effect.playerId;
this.condition = effect.condition;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/AttackIfAbleTargetRandomOpponentSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/AttackIfAbleTargetRandomOpponentSourceEffect.java
index 2d1ab06f3c7..0042d1708fa 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/AttackIfAbleTargetRandomOpponentSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/AttackIfAbleTargetRandomOpponentSourceEffect.java
@@ -21,7 +21,7 @@ public class AttackIfAbleTargetRandomOpponentSourceEffect extends OneShotEffect
this.staticText = "choose an opponent at random. {this} attacks that player this combat if able";
}
- public AttackIfAbleTargetRandomOpponentSourceEffect(final AttackIfAbleTargetRandomOpponentSourceEffect effect) {
+ protected AttackIfAbleTargetRandomOpponentSourceEffect(final AttackIfAbleTargetRandomOpponentSourceEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/AttacksIfAbleAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/AttacksIfAbleAllEffect.java
index 44467a503d1..55c8288d07f 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/AttacksIfAbleAllEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/AttacksIfAbleAllEffect.java
@@ -10,7 +10,6 @@ import mage.game.permanent.Permanent;
import mage.watchers.common.AttackedThisTurnWatcher;
/**
- *
* @author LevelX2
*/
public class AttacksIfAbleAllEffect extends RequirementEffect {
@@ -39,7 +38,7 @@ public class AttacksIfAbleAllEffect extends RequirementEffect {
}
}
- public AttacksIfAbleAllEffect(final AttacksIfAbleAllEffect effect) {
+ protected AttacksIfAbleAllEffect(final AttacksIfAbleAllEffect effect) {
super(effect);
this.filter = effect.filter;
this.eachCombat = effect.eachCombat;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/AttacksIfAbleAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/AttacksIfAbleAttachedEffect.java
index f5eaf386ff9..2f55076b93c 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/AttacksIfAbleAttachedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/AttacksIfAbleAttachedEffect.java
@@ -8,7 +8,6 @@ import mage.game.Game;
import mage.game.permanent.Permanent;
/**
- *
* @author LevelX2
*/
@@ -19,7 +18,7 @@ public class AttacksIfAbleAttachedEffect extends RequirementEffect {
this.staticText = attachmentType.verb() + " creature attacks each combat if able";
}
- public AttacksIfAbleAttachedEffect(final AttacksIfAbleAttachedEffect effect) {
+ protected AttacksIfAbleAttachedEffect(final AttacksIfAbleAttachedEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/AttacksIfAbleSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/AttacksIfAbleSourceEffect.java
index 3ba95e8c66b..672af9f8574 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/AttacksIfAbleSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/AttacksIfAbleSourceEffect.java
@@ -10,7 +10,6 @@ import mage.game.permanent.Permanent;
import mage.watchers.common.AttackedThisTurnWatcher;
/**
- *
* @author BetaSteward_at_googlemail.com
*/
public class AttacksIfAbleSourceEffect extends RequirementEffect {
@@ -31,7 +30,7 @@ public class AttacksIfAbleSourceEffect extends RequirementEffect {
}
}
- public AttacksIfAbleSourceEffect(final AttacksIfAbleSourceEffect effect) {
+ protected AttacksIfAbleSourceEffect(final AttacksIfAbleSourceEffect effect) {
super(effect);
this.eachCombat = effect.eachCombat;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/AttacksIfAbleTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/AttacksIfAbleTargetEffect.java
index 119e6ac3c47..e545e97dd98 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/AttacksIfAbleTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/AttacksIfAbleTargetEffect.java
@@ -35,7 +35,7 @@ public class AttacksIfAbleTargetEffect extends RequirementEffect {
}
}
- public AttacksIfAbleTargetEffect(final AttacksIfAbleTargetEffect effect) {
+ protected AttacksIfAbleTargetEffect(final AttacksIfAbleTargetEffect effect) {
super(effect);
this.mustAttacks = effect.mustAttacks;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/BlocksIfAbleAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/BlocksIfAbleAllEffect.java
index 36427942acc..839fd8d0772 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/BlocksIfAbleAllEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/BlocksIfAbleAllEffect.java
@@ -8,7 +8,6 @@ import mage.game.Game;
import mage.game.permanent.Permanent;
/**
- *
* @author LevelX2
*/
@@ -17,7 +16,7 @@ public class BlocksIfAbleAllEffect extends RequirementEffect {
private final FilterCreaturePermanent filter;
public BlocksIfAbleAllEffect(FilterCreaturePermanent filter) {
- this(filter,Duration.WhileOnBattlefield);
+ this(filter, Duration.WhileOnBattlefield);
}
public BlocksIfAbleAllEffect(FilterCreaturePermanent filter, Duration duration) {
@@ -25,7 +24,8 @@ public class BlocksIfAbleAllEffect extends RequirementEffect {
this.filter = filter;
staticText = filter.getMessage() + " block " + (duration == Duration.EndOfTurn ? "this turn" : "each combat") + " if able";
}
- public BlocksIfAbleAllEffect(final BlocksIfAbleAllEffect effect) {
+
+ protected BlocksIfAbleAllEffect(final BlocksIfAbleAllEffect effect) {
super(effect);
this.filter = effect.filter;
}
@@ -39,17 +39,17 @@ public class BlocksIfAbleAllEffect extends RequirementEffect {
public boolean applies(Permanent permanent, Ability source, Game game) {
return filter.match(permanent, source.getControllerId(), source, game);
}
-
+
@Override
public boolean mustBlock(Game game) {
return true;
}
-
+
@Override
public boolean mustBlockAny(Game game) {
return true;
}
-
+
@Override
public boolean mustAttack(Game game) {
return false;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/BlocksIfAbleAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/BlocksIfAbleAttachedEffect.java
index dc41a792226..3583de95cd4 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/BlocksIfAbleAttachedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/BlocksIfAbleAttachedEffect.java
@@ -18,7 +18,7 @@ public class BlocksIfAbleAttachedEffect extends RequirementEffect {
this.staticText = attachmentType.verb() + " creature blocks each combat if able";
}
- public BlocksIfAbleAttachedEffect(final BlocksIfAbleAttachedEffect effect) {
+ protected BlocksIfAbleAttachedEffect(final BlocksIfAbleAttachedEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/BlocksIfAbleSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/BlocksIfAbleSourceEffect.java
index ecc7a07a576..a081b262316 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/BlocksIfAbleSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/BlocksIfAbleSourceEffect.java
@@ -8,7 +8,6 @@ import mage.game.Game;
import mage.game.permanent.Permanent;
/**
- *
* @author LevelX2
*/
public class BlocksIfAbleSourceEffect extends RequirementEffect {
@@ -18,7 +17,7 @@ public class BlocksIfAbleSourceEffect extends RequirementEffect {
staticText = "{this} blocks each combat if able.";
}
- public BlocksIfAbleSourceEffect(final BlocksIfAbleSourceEffect effect) {
+ protected BlocksIfAbleSourceEffect(final BlocksIfAbleSourceEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CanAttackAsThoughItDidntHaveDefenderSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CanAttackAsThoughItDidntHaveDefenderSourceEffect.java
index 3ff4271d8ef..8f5228c0277 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CanAttackAsThoughItDidntHaveDefenderSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CanAttackAsThoughItDidntHaveDefenderSourceEffect.java
@@ -2,6 +2,7 @@
package mage.abilities.effects.common.combat;
import java.util.UUID;
+
import mage.abilities.Ability;
import mage.abilities.effects.AsThoughEffectImpl;
import mage.constants.AsThoughEffectType;
@@ -10,7 +11,6 @@ import mage.constants.Outcome;
import mage.game.Game;
/**
- *
* @author LevelX2
*/
public class CanAttackAsThoughItDidntHaveDefenderSourceEffect extends AsThoughEffectImpl {
@@ -26,7 +26,7 @@ public class CanAttackAsThoughItDidntHaveDefenderSourceEffect extends AsThoughEf
+ "as though it didn't have defender";
}
- public CanAttackAsThoughItDidntHaveDefenderSourceEffect(final CanAttackAsThoughItDidntHaveDefenderSourceEffect effect) {
+ protected CanAttackAsThoughItDidntHaveDefenderSourceEffect(final CanAttackAsThoughItDidntHaveDefenderSourceEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CanAttackOnlyAloneEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CanAttackOnlyAloneEffect.java
index 65fb23661cc..ecf9a975b1f 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CanAttackOnlyAloneEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CanAttackOnlyAloneEffect.java
@@ -16,7 +16,7 @@ public class CanAttackOnlyAloneEffect extends RestrictionEffect {
staticText = "{this} can only attack alone";
}
- public CanAttackOnlyAloneEffect(final CanAttackOnlyAloneEffect effect) {
+ protected CanAttackOnlyAloneEffect(final CanAttackOnlyAloneEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CanBlockAdditionalCreatureAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CanBlockAdditionalCreatureAllEffect.java
index db83a18825d..1abd8033558 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CanBlockAdditionalCreatureAllEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CanBlockAdditionalCreatureAllEffect.java
@@ -28,7 +28,7 @@ public class CanBlockAdditionalCreatureAllEffect extends ContinuousEffectImpl {
staticText = setText();
}
- public CanBlockAdditionalCreatureAllEffect(final CanBlockAdditionalCreatureAllEffect effect) {
+ protected CanBlockAdditionalCreatureAllEffect(final CanBlockAdditionalCreatureAllEffect effect) {
super(effect);
this.amount = effect.amount;
this.filter = effect.filter;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CanBlockAdditionalCreatureEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CanBlockAdditionalCreatureEffect.java
index a2e4f73f2b5..2eb7ea69efe 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CanBlockAdditionalCreatureEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CanBlockAdditionalCreatureEffect.java
@@ -37,7 +37,7 @@ public class CanBlockAdditionalCreatureEffect extends ContinuousEffectImpl {
staticText = setText();
}
- public CanBlockAdditionalCreatureEffect(final CanBlockAdditionalCreatureEffect effect) {
+ protected CanBlockAdditionalCreatureEffect(final CanBlockAdditionalCreatureEffect effect) {
super(effect);
this.amount = effect.amount;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CanBlockAdditionalCreatureTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CanBlockAdditionalCreatureTargetEffect.java
index 5f56d1f27b6..d0129459a92 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CanBlockAdditionalCreatureTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CanBlockAdditionalCreatureTargetEffect.java
@@ -27,7 +27,7 @@ public class CanBlockAdditionalCreatureTargetEffect extends ContinuousEffectImpl
staticText = setText();
}
- public CanBlockAdditionalCreatureTargetEffect(final CanBlockAdditionalCreatureTargetEffect effect) {
+ protected CanBlockAdditionalCreatureTargetEffect(final CanBlockAdditionalCreatureTargetEffect effect) {
super(effect);
this.amount = effect.amount;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CanBlockOnlyFlyingAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CanBlockOnlyFlyingAttachedEffect.java
index a3b94d6f0af..ba3f90e652a 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CanBlockOnlyFlyingAttachedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CanBlockOnlyFlyingAttachedEffect.java
@@ -19,7 +19,7 @@ public class CanBlockOnlyFlyingAttachedEffect extends RestrictionEffect {
this.staticText = attachmentType.verb() + " creature can block only creatures with flying";
}
- public CanBlockOnlyFlyingAttachedEffect(final CanBlockOnlyFlyingAttachedEffect effect) {
+ protected CanBlockOnlyFlyingAttachedEffect(final CanBlockOnlyFlyingAttachedEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CanBlockOnlyFlyingEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CanBlockOnlyFlyingEffect.java
index 4d41916cb48..52cdf834e2b 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CanBlockOnlyFlyingEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CanBlockOnlyFlyingEffect.java
@@ -19,7 +19,7 @@ public class CanBlockOnlyFlyingEffect extends RestrictionEffect {
this.staticText = "{this} can block only creatures with flying";
}
- public CanBlockOnlyFlyingEffect(final CanBlockOnlyFlyingEffect effect) {
+ protected CanBlockOnlyFlyingEffect(final CanBlockOnlyFlyingEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAloneAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAloneAttachedEffect.java
index a7589bd7225..48df6f8be3d 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAloneAttachedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAloneAttachedEffect.java
@@ -17,7 +17,7 @@ public class CantAttackAloneAttachedEffect extends RestrictionEffect {
this.staticText = attachmentType.verb() + " creature can't attack alone";
}
- public CantAttackAloneAttachedEffect(final CantAttackAloneAttachedEffect effect) {
+ protected CantAttackAloneAttachedEffect(final CantAttackAloneAttachedEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAloneSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAloneSourceEffect.java
index 28ea3271c31..e89a75ef1d9 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAloneSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAloneSourceEffect.java
@@ -16,7 +16,7 @@ public class CantAttackAloneSourceEffect extends RestrictionEffect {
staticText = "{this} can't attack alone";
}
- public CantAttackAloneSourceEffect(final CantAttackAloneSourceEffect effect) {
+ protected CantAttackAloneSourceEffect(final CantAttackAloneSourceEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAnyPlayerAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAnyPlayerAllEffect.java
index adabfff371f..cd52492b0a4 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAnyPlayerAllEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAnyPlayerAllEffect.java
@@ -31,7 +31,7 @@ public class CantAttackAnyPlayerAllEffect extends RestrictionEffect {
staticText = sb.toString();
}
- public CantAttackAnyPlayerAllEffect(final CantAttackAnyPlayerAllEffect effect) {
+ protected CantAttackAnyPlayerAllEffect(final CantAttackAnyPlayerAllEffect effect) {
super(effect);
this.filter = effect.filter;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAnyPlayerSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAnyPlayerSourceEffect.java
index 0a4365b39f5..5021210a4aa 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAnyPlayerSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAnyPlayerSourceEffect.java
@@ -17,7 +17,7 @@ public class CantAttackAnyPlayerSourceEffect extends RestrictionEffect {
super(duration);
}
- public CantAttackAnyPlayerSourceEffect(final CantAttackAnyPlayerSourceEffect effect) {
+ protected CantAttackAnyPlayerSourceEffect(final CantAttackAnyPlayerSourceEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAttachedEffect.java
index 3b726f3ca0e..eb12f9b7ea9 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAttachedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAttachedEffect.java
@@ -18,7 +18,7 @@ public class CantAttackAttachedEffect extends RestrictionEffect {
this.staticText = attachmentType.verb() + " creature can't attack";
}
- public CantAttackAttachedEffect(final CantAttackAttachedEffect effect) {
+ protected CantAttackAttachedEffect(final CantAttackAttachedEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackBlockAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackBlockAllEffect.java
index 60f2a70d9c7..05860f4d88a 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackBlockAllEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackBlockAllEffect.java
@@ -29,7 +29,7 @@ public class CantAttackBlockAllEffect extends RestrictionEffect {
staticText = sb.toString();
}
- public CantAttackBlockAllEffect(final CantAttackBlockAllEffect effect) {
+ protected CantAttackBlockAllEffect(final CantAttackBlockAllEffect effect) {
super(effect);
this.filter = effect.filter;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackBlockAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackBlockAttachedEffect.java
index e52b3cd5b6b..aa630d665ba 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackBlockAttachedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackBlockAttachedEffect.java
@@ -18,7 +18,7 @@ public class CantAttackBlockAttachedEffect extends RestrictionEffect {
this.staticText = attachmentType.verb() + " creature can't attack or block";
}
- public CantAttackBlockAttachedEffect(final CantAttackBlockAttachedEffect effect) {
+ protected CantAttackBlockAttachedEffect(final CantAttackBlockAttachedEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackBlockTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackBlockTargetEffect.java
index 6e146d01db4..60a57b99b78 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackBlockTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackBlockTargetEffect.java
@@ -16,7 +16,7 @@ public class CantAttackBlockTargetEffect extends RestrictionEffect {
super(duration);
}
- public CantAttackBlockTargetEffect(final CantAttackBlockTargetEffect effect) {
+ protected CantAttackBlockTargetEffect(final CantAttackBlockTargetEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackBlockUnlessConditionSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackBlockUnlessConditionSourceEffect.java
index 2f035c6f9ad..2e22b989744 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackBlockUnlessConditionSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackBlockUnlessConditionSourceEffect.java
@@ -20,7 +20,7 @@ public class CantAttackBlockUnlessConditionSourceEffect extends RestrictionEffec
staticText = "{this} can't attack or block unless " + condition.toString();
}
- public CantAttackBlockUnlessConditionSourceEffect(final CantAttackBlockUnlessConditionSourceEffect effect) {
+ protected CantAttackBlockUnlessConditionSourceEffect(final CantAttackBlockUnlessConditionSourceEffect effect) {
super(effect);
this.condition = effect.condition;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackIfDefenderControlsPermanent.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackIfDefenderControlsPermanent.java
index 21f0fece9a4..a20f418a86e 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackIfDefenderControlsPermanent.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackIfDefenderControlsPermanent.java
@@ -24,7 +24,7 @@ public class CantAttackIfDefenderControlsPermanent extends RestrictionEffect {
staticText = new StringBuilder("{this} can't attack if defending player controls ").append(filter.getMessage()).toString();
}
- public CantAttackIfDefenderControlsPermanent(final CantAttackIfDefenderControlsPermanent effect) {
+ protected CantAttackIfDefenderControlsPermanent(final CantAttackIfDefenderControlsPermanent effect) {
super(effect);
this.filter = effect.filter;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackSourceEffect.java
index d47f577799d..5541d1b637a 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackSourceEffect.java
@@ -16,7 +16,7 @@ public class CantAttackSourceEffect extends RestrictionEffect {
this.staticText = "{this} can't attack";
}
- public CantAttackSourceEffect(final CantAttackSourceEffect effect) {
+ protected CantAttackSourceEffect(final CantAttackSourceEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackUnlessDefenderControllsPermanent.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackUnlessDefenderControllsPermanent.java
index f783c08a55e..6d85d3fe3b7 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackUnlessDefenderControllsPermanent.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackUnlessDefenderControllsPermanent.java
@@ -24,7 +24,7 @@ public class CantAttackUnlessDefenderControllsPermanent extends RestrictionEffec
staticText = new StringBuilder("{this} can't attack unless defending player controls ").append(filter.getMessage()).toString();
}
- public CantAttackUnlessDefenderControllsPermanent(final CantAttackUnlessDefenderControllsPermanent effect) {
+ protected CantAttackUnlessDefenderControllsPermanent(final CantAttackUnlessDefenderControllsPermanent effect) {
super(effect);
this.filter = effect.filter;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouEffect.java
index a4dfb5227d8..5b949f81687 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouEffect.java
@@ -1,6 +1,7 @@
package mage.abilities.effects.common.combat;
import java.util.UUID;
+
import mage.abilities.Ability;
import mage.abilities.effects.RestrictionEffect;
import mage.constants.Duration;
@@ -16,7 +17,7 @@ public class CantAttackYouEffect extends RestrictionEffect {
super(duration);
}
- public CantAttackYouEffect(final CantAttackYouEffect effect) {
+ protected CantAttackYouEffect(final CantAttackYouEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByAllSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByAllSourceEffect.java
index f1f9fa54a7e..c64267916f2 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByAllSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByAllSourceEffect.java
@@ -23,7 +23,7 @@ public class CantBeBlockedByAllSourceEffect extends RestrictionEffect {
+ filterBlockedBy.getMessage();
}
- public CantBeBlockedByAllSourceEffect(final CantBeBlockedByAllSourceEffect effect) {
+ protected CantBeBlockedByAllSourceEffect(final CantBeBlockedByAllSourceEffect effect) {
super(effect);
this.filterBlockedBy = effect.filterBlockedBy;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesAllEffect.java
index 74276fd0be0..3b73c9d77e0 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesAllEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesAllEffect.java
@@ -25,7 +25,7 @@ public class CantBeBlockedByCreaturesAllEffect extends RestrictionEffect {
+ filterBlockedBy.getMessage();
}
- public CantBeBlockedByCreaturesAllEffect(final CantBeBlockedByCreaturesAllEffect effect) {
+ protected CantBeBlockedByCreaturesAllEffect(final CantBeBlockedByCreaturesAllEffect effect) {
super(effect);
this.filterCreatures = effect.filterCreatures;
this.filterBlockedBy = effect.filterBlockedBy;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesAttachedEffect.java
index 2cf6dae0d13..a8ed5ad873b 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesAttachedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesAttachedEffect.java
@@ -24,7 +24,7 @@ public class CantBeBlockedByCreaturesAttachedEffect extends RestrictionEffect {
.append(filter.getMessage().startsWith("except by") ? "" : "by ").append(filter.getMessage()).toString();
}
- public CantBeBlockedByCreaturesAttachedEffect(final CantBeBlockedByCreaturesAttachedEffect effect) {
+ protected CantBeBlockedByCreaturesAttachedEffect(final CantBeBlockedByCreaturesAttachedEffect effect) {
super(effect);
this.filter = effect.filter;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesSourceEffect.java
index c858b739574..2a4467f3df5 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesSourceEffect.java
@@ -21,7 +21,7 @@ public class CantBeBlockedByCreaturesSourceEffect extends RestrictionEffect {
+ (filter.getMessage().startsWith("except by") ? "" : "by ") + filter.getMessage();
}
- public CantBeBlockedByCreaturesSourceEffect(final CantBeBlockedByCreaturesSourceEffect effect) {
+ protected CantBeBlockedByCreaturesSourceEffect(final CantBeBlockedByCreaturesSourceEffect effect) {
super(effect);
this.filter = effect.filter;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesWithGreaterPowerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesWithGreaterPowerEffect.java
index 96774ecc3ea..e5ae4f78925 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesWithGreaterPowerEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesWithGreaterPowerEffect.java
@@ -16,7 +16,7 @@ public class CantBeBlockedByCreaturesWithGreaterPowerEffect extends RestrictionE
staticText = "Creatures with power greater than {this}'s power can't block it";
}
- public CantBeBlockedByCreaturesWithGreaterPowerEffect(final CantBeBlockedByCreaturesWithGreaterPowerEffect effect) {
+ protected CantBeBlockedByCreaturesWithGreaterPowerEffect(final CantBeBlockedByCreaturesWithGreaterPowerEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesWithLessPowerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesWithLessPowerEffect.java
index 4bb2102dc3c..4f1cea5c1e9 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesWithLessPowerEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesWithLessPowerEffect.java
@@ -16,7 +16,7 @@ public class CantBeBlockedByCreaturesWithLessPowerEffect extends RestrictionEffe
staticText = "Creatures with power less than {this}'s power can't block it";
}
- public CantBeBlockedByCreaturesWithLessPowerEffect(final CantBeBlockedByCreaturesWithLessPowerEffect effect) {
+ protected CantBeBlockedByCreaturesWithLessPowerEffect(final CantBeBlockedByCreaturesWithLessPowerEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByMoreThanOneAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByMoreThanOneAllEffect.java
index f36a37fc870..da18fcfefaf 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByMoreThanOneAllEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByMoreThanOneAllEffect.java
@@ -15,7 +15,6 @@ import mage.game.permanent.Permanent;
import mage.util.CardUtil;
/**
- *
* @author Quercitron
*/
public class CantBeBlockedByMoreThanOneAllEffect extends ContinuousEffectImpl {
@@ -39,7 +38,7 @@ public class CantBeBlockedByMoreThanOneAllEffect extends ContinuousEffectImpl {
.append(CardUtil.numberToText(amount)).append(" creature").append(amount > 1 ? "s" : "").toString();
}
- public CantBeBlockedByMoreThanOneAllEffect(final CantBeBlockedByMoreThanOneAllEffect effect) {
+ protected CantBeBlockedByMoreThanOneAllEffect(final CantBeBlockedByMoreThanOneAllEffect effect) {
super(effect);
this.amount = effect.amount;
this.filter = effect.filter;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByMoreThanOneSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByMoreThanOneSourceEffect.java
index cb6a7545126..f4fbdca9873 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByMoreThanOneSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByMoreThanOneSourceEffect.java
@@ -14,7 +14,6 @@ import mage.game.permanent.Permanent;
import mage.util.CardUtil;
/**
- *
* @author Quercitron
*/
public class CantBeBlockedByMoreThanOneSourceEffect extends ContinuousEffectImpl {
@@ -33,10 +32,10 @@ public class CantBeBlockedByMoreThanOneSourceEffect extends ContinuousEffectImpl
super(duration, Outcome.Benefit);
this.amount = amount;
staticText = "{this} can't be blocked by more than " + CardUtil.numberToText(amount) + " creature" + (amount > 1 ? "s" : "")
- + (duration == Duration.EndOfTurn ? " each combat this turn" : "");
+ + (duration == Duration.EndOfTurn ? " each combat this turn" : "");
}
- public CantBeBlockedByMoreThanOneSourceEffect(final CantBeBlockedByMoreThanOneSourceEffect effect) {
+ protected CantBeBlockedByMoreThanOneSourceEffect(final CantBeBlockedByMoreThanOneSourceEffect effect) {
super(effect);
this.amount = effect.amount;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByOneAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByOneAllEffect.java
index a65111d02ec..e649ee0543d 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByOneAllEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByOneAllEffect.java
@@ -13,7 +13,6 @@ import mage.game.permanent.Permanent;
import mage.util.CardUtil;
/**
- *
* @author LevelX2
*/
public class CantBeBlockedByOneAllEffect extends ContinuousEffectImpl {
@@ -37,7 +36,7 @@ public class CantBeBlockedByOneAllEffect extends ContinuousEffectImpl {
staticText = sb.toString();
}
- public CantBeBlockedByOneAllEffect(final CantBeBlockedByOneAllEffect effect) {
+ protected CantBeBlockedByOneAllEffect(final CantBeBlockedByOneAllEffect effect) {
super(effect);
this.amount = effect.amount;
this.filter = effect.filter;
@@ -52,11 +51,11 @@ public class CantBeBlockedByOneAllEffect extends ContinuousEffectImpl {
public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) {
switch (layer) {
case RulesEffects:
- for (Permanent perm: game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source, game)) {
+ for (Permanent perm : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source, game)) {
perm.setMinBlockedBy(amount);
}
break;
- }
+ }
return true;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByOneAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByOneAttachedEffect.java
index eb3175a154a..6292e5fc4f9 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByOneAttachedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByOneAttachedEffect.java
@@ -12,7 +12,6 @@ import mage.game.Game;
import mage.game.permanent.Permanent;
/**
- *
* @author LevelX2
*/
public class CantBeBlockedByOneAttachedEffect extends ContinuousEffectImpl {
@@ -31,7 +30,7 @@ public class CantBeBlockedByOneAttachedEffect extends ContinuousEffectImpl {
staticText = attachmentType.verb() + " creature can't be blocked except by " + amount + " or more creatures";
}
- public CantBeBlockedByOneAttachedEffect(final CantBeBlockedByOneAttachedEffect effect) {
+ protected CantBeBlockedByOneAttachedEffect(final CantBeBlockedByOneAttachedEffect effect) {
super(effect);
this.amount = effect.amount;
this.attachmentType = effect.attachmentType;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByOneEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByOneEffect.java
index 7ee7bc31c57..47a0cf7e4ee 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByOneEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByOneEffect.java
@@ -27,7 +27,7 @@ public class CantBeBlockedByOneEffect extends ContinuousEffectImpl {
staticText = "{this} can't be blocked except by " + CardUtil.numberToText(amount) + " or more creatures";
}
- public CantBeBlockedByOneEffect(final CantBeBlockedByOneEffect effect) {
+ protected CantBeBlockedByOneEffect(final CantBeBlockedByOneEffect effect) {
super(effect);
this.amount = effect.amount;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockActivateAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockActivateAttachedEffect.java
index fcbbc3a3e07..67383dea9ff 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockActivateAttachedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockActivateAttachedEffect.java
@@ -16,7 +16,7 @@ public class CantBlockActivateAttachedEffect extends RestrictionEffect {
staticText = "Enchanted creature can't block, and its activated abilities can't be activated";
}
- public CantBlockActivateAttachedEffect(final CantBlockActivateAttachedEffect effect) {
+ protected CantBlockActivateAttachedEffect(final CantBlockActivateAttachedEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockAttachedEffect.java
index a61c3275c1c..54c6978d55a 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockAttachedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockAttachedEffect.java
@@ -41,7 +41,7 @@ public class CantBlockAttachedEffect extends RestrictionEffect {
staticText = sb.toString();
}
- public CantBlockAttachedEffect(final CantBlockAttachedEffect effect) {
+ protected CantBlockAttachedEffect(final CantBlockAttachedEffect effect) {
super(effect);
this.filter = effect.filter;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockAttackActivateAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockAttackActivateAttachedEffect.java
index b706bbcc9cb..b64870390bd 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockAttackActivateAttachedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockAttackActivateAttachedEffect.java
@@ -20,7 +20,7 @@ public class CantBlockAttackActivateAttachedEffect extends RestrictionEffect {
staticText = "Enchanted " + enchantedName + " can't attack or block, and its activated abilities can't be activated";
}
- public CantBlockAttackActivateAttachedEffect(final CantBlockAttackActivateAttachedEffect effect) {
+ protected CantBlockAttackActivateAttachedEffect(final CantBlockAttackActivateAttachedEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockSourceEffect.java
index 81d4735b0d6..799e46d8e04 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockSourceEffect.java
@@ -19,7 +19,7 @@ public class CantBlockSourceEffect extends RestrictionEffect {
}
}
- public CantBlockSourceEffect(final CantBlockSourceEffect effect) {
+ protected CantBlockSourceEffect(final CantBlockSourceEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockUnlessYouControlSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockUnlessYouControlSourceEffect.java
index 3e1fed9d0dd..b7289e0a7e8 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockUnlessYouControlSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockUnlessYouControlSourceEffect.java
@@ -20,7 +20,7 @@ public class CantBlockUnlessYouControlSourceEffect extends RestrictionEffect {
staticText = "{this} can't block unless you control " + filter.getMessage();
}
- public CantBlockUnlessYouControlSourceEffect(final CantBlockUnlessYouControlSourceEffect effect) {
+ protected CantBlockUnlessYouControlSourceEffect(final CantBlockUnlessYouControlSourceEffect effect) {
super(effect);
this.filter = effect.filter;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAllAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAllAttachedEffect.java
index 38fccf97aaf..3caee900dd3 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAllAttachedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAllAttachedEffect.java
@@ -3,6 +3,7 @@ package mage.abilities.effects.common.combat;
import java.util.Locale;
import java.util.UUID;
+
import mage.abilities.Ability;
import mage.abilities.effects.RequirementEffect;
import mage.constants.AttachmentType;
@@ -27,7 +28,7 @@ public class MustBeBlockedByAllAttachedEffect extends RequirementEffect {
staticText = "All creatures able to block " + attachmentType.verb().toLowerCase(Locale.ENGLISH) + " creature do so";
}
- public MustBeBlockedByAllAttachedEffect(final MustBeBlockedByAllAttachedEffect effect) {
+ protected MustBeBlockedByAllAttachedEffect(final MustBeBlockedByAllAttachedEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAllSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAllSourceEffect.java
index 41ee0a79d0a..a0d6c67839e 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAllSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAllSourceEffect.java
@@ -1,6 +1,7 @@
package mage.abilities.effects.common.combat;
import java.util.UUID;
+
import mage.constants.Duration;
import mage.abilities.Ability;
import mage.abilities.effects.RequirementEffect;
@@ -10,7 +11,6 @@ import mage.game.Game;
import mage.game.permanent.Permanent;
/**
- *
* @author BetaSteward_at_googlemail.com
*/
public class MustBeBlockedByAllSourceEffect extends RequirementEffect {
@@ -32,7 +32,7 @@ public class MustBeBlockedByAllSourceEffect extends RequirementEffect {
+ (duration.equals(Duration.EndOfTurn) ? " this turn " : " ") + "do so";
}
- public MustBeBlockedByAllSourceEffect(final MustBeBlockedByAllSourceEffect effect) {
+ protected MustBeBlockedByAllSourceEffect(final MustBeBlockedByAllSourceEffect effect) {
super(effect);
this.filter = effect.filter;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAllTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAllTargetEffect.java
index d8806469c3d..fd41ecea46e 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAllTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAllTargetEffect.java
@@ -3,6 +3,7 @@
package mage.abilities.effects.common.combat;
import java.util.UUID;
+
import mage.abilities.Ability;
import mage.abilities.effects.RequirementEffect;
import mage.constants.AbilityType;
@@ -12,7 +13,6 @@ import mage.game.permanent.Permanent;
import mage.watchers.common.BlockedAttackerWatcher;
/**
- *
* @author LevelX2
*/
public class MustBeBlockedByAllTargetEffect extends RequirementEffect {
@@ -24,12 +24,12 @@ public class MustBeBlockedByAllTargetEffect extends RequirementEffect {
"do so";
}
- public MustBeBlockedByAllTargetEffect(final MustBeBlockedByAllTargetEffect effect) {
+ protected MustBeBlockedByAllTargetEffect(final MustBeBlockedByAllTargetEffect effect) {
super(effect);
}
@Override
- public boolean applies(Permanent permanent, Ability source, Game game) {
+ public boolean applies(Permanent permanent, Ability source, Game game) {
Permanent attackingCreature = game.getPermanent(this.getTargetPointer().getFirst(game, source));
if (attackingCreature != null && attackingCreature.isAttacking()) {
if (source.getAbilityType() != AbilityType.STATIC) {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAtLeastOneSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAtLeastOneSourceEffect.java
index 406818da2ae..8fc9170874d 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAtLeastOneSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAtLeastOneSourceEffect.java
@@ -49,7 +49,7 @@ public class MustBeBlockedByAtLeastOneSourceEffect extends RequirementEffect {
staticText = "{this} must be blocked " + (duration == Duration.EndOfTurn ? "this turn " : "") + "if able";
}
- public MustBeBlockedByAtLeastOneSourceEffect(final MustBeBlockedByAtLeastOneSourceEffect effect) {
+ protected MustBeBlockedByAtLeastOneSourceEffect(final MustBeBlockedByAtLeastOneSourceEffect effect) {
super(effect);
this.minNumberOfBlockers = effect.minNumberOfBlockers;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAtLeastOneTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAtLeastOneTargetEffect.java
index 76614f818ed..aaaca995fac 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAtLeastOneTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAtLeastOneTargetEffect.java
@@ -2,6 +2,7 @@
package mage.abilities.effects.common.combat;
import java.util.UUID;
+
import mage.abilities.Ability;
import mage.abilities.effects.RequirementEffect;
import mage.constants.Duration;
@@ -10,13 +11,13 @@ import mage.game.permanent.Permanent;
/**
* !! This effect does only support one target.
- *
- *
+ *
+ *
* http://tappedout.net/mtg-questions/must-be-blocked-if-able-effect-makes-other-attacking-creatures-essentially-unblockable/
- *
+ *
* When you Declare Blockers, you choose an arrangement for your blockers, then
* check to see if there are any restrictions or requirements.
- *
+ *
* If any restrictions are violated, the block is illegal. (For example, trying
* to block with Sightless Ghoul) If any requirements are violated, the least
* possible number of requirements must be violated, otherwise the block is
@@ -48,7 +49,7 @@ public class MustBeBlockedByAtLeastOneTargetEffect extends RequirementEffect {
staticText = "target creature must be blocked this turn if able";
}
- public MustBeBlockedByAtLeastOneTargetEffect(final MustBeBlockedByAtLeastOneTargetEffect effect) {
+ protected MustBeBlockedByAtLeastOneTargetEffect(final MustBeBlockedByAtLeastOneTargetEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByTargetSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByTargetSourceEffect.java
index 3f6474e6172..120421bd20a 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByTargetSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByTargetSourceEffect.java
@@ -3,6 +3,7 @@
package mage.abilities.effects.common.combat;
import java.util.UUID;
+
import mage.abilities.Ability;
import mage.abilities.effects.RequirementEffect;
import mage.constants.Duration;
@@ -11,7 +12,6 @@ import mage.game.permanent.Permanent;
import mage.watchers.common.BlockedAttackerWatcher;
/**
- *
* @author BetaSteward_at_googlemail.com
*/
public class MustBeBlockedByTargetSourceEffect extends RequirementEffect {
@@ -25,7 +25,7 @@ public class MustBeBlockedByTargetSourceEffect extends RequirementEffect {
staticText = "target creature blocks {this} this turn if able";
}
- public MustBeBlockedByTargetSourceEffect(final MustBeBlockedByTargetSourceEffect effect) {
+ protected MustBeBlockedByTargetSourceEffect(final MustBeBlockedByTargetSourceEffect effect) {
super(effect);
}
@@ -33,14 +33,14 @@ public class MustBeBlockedByTargetSourceEffect extends RequirementEffect {
public boolean applies(Permanent permanent, Ability source, Game game) {
if (permanent.getId().equals(this.getTargetPointer().getFirst(game, source))) {
Permanent blocker = game.getPermanent(this.getTargetPointer().getFirst(game, source));
- if (blocker != null && blocker.canBlock(source.getSourceId(), game)) {
+ if (blocker != null && blocker.canBlock(source.getSourceId(), game)) {
Permanent attacker = source.getSourcePermanentIfItStillExists(game);
if (attacker != null) {
BlockedAttackerWatcher blockedAttackerWatcher = game.getState().getWatcher(BlockedAttackerWatcher.class);
if (blockedAttackerWatcher != null && blockedAttackerWatcher.creatureHasBlockedAttacker(attacker, blocker, game)) {
// has already blocked this turn, so no need to do again
return false;
- }
+ }
return true;
} else {
discard();
@@ -61,7 +61,7 @@ public class MustBeBlockedByTargetSourceEffect extends RequirementEffect {
}
@Override
- public UUID mustBlockAttacker(Ability source, Game game) {
+ public UUID mustBlockAttacker(Ability source, Game game) {
return source.getSourceId();
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/ActivateAbilitiesAnyTimeYouCouldCastInstantEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/ActivateAbilitiesAnyTimeYouCouldCastInstantEffect.java
index 0336b383e1f..b35deee00eb 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/ActivateAbilitiesAnyTimeYouCouldCastInstantEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/ActivateAbilitiesAnyTimeYouCouldCastInstantEffect.java
@@ -1,6 +1,7 @@
package mage.abilities.effects.common.continuous;
import java.util.UUID;
+
import mage.abilities.Ability;
import mage.abilities.effects.AsThoughEffectImpl;
import mage.constants.AsThoughEffectType;
@@ -9,7 +10,6 @@ import mage.constants.Outcome;
import mage.game.Game;
/**
- *
* @author Styxo
*/
public class ActivateAbilitiesAnyTimeYouCouldCastInstantEffect extends AsThoughEffectImpl {
@@ -22,7 +22,7 @@ public class ActivateAbilitiesAnyTimeYouCouldCastInstantEffect extends AsThoughE
staticText = "You may activate " + activatedAbilityName + " any time you could cast an instant";
}
- public ActivateAbilitiesAnyTimeYouCouldCastInstantEffect(final ActivateAbilitiesAnyTimeYouCouldCastInstantEffect effect) {
+ protected ActivateAbilitiesAnyTimeYouCouldCastInstantEffect(final ActivateAbilitiesAnyTimeYouCouldCastInstantEffect effect) {
super(effect);
this.activatedAbility = effect.activatedAbility;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardColorAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardColorAttachedEffect.java
index 665b9783f2a..07cff2680a5 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardColorAttachedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardColorAttachedEffect.java
@@ -24,7 +24,7 @@ public class AddCardColorAttachedEffect extends ContinuousEffectImpl {
setText();
}
- public AddCardColorAttachedEffect(final AddCardColorAttachedEffect effect) {
+ protected AddCardColorAttachedEffect(final AddCardColorAttachedEffect effect) {
super(effect);
this.addedColor = effect.addedColor;
this.attachmentType = effect.attachmentType;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubTypeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubTypeTargetEffect.java
index 9ddd96180a0..67c77a0e3ec 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubTypeTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubTypeTargetEffect.java
@@ -21,7 +21,7 @@ public class AddCardSubTypeTargetEffect extends ContinuousEffectImpl {
this.addedSubType = addedSubType;
}
- public AddCardSubTypeTargetEffect(final AddCardSubTypeTargetEffect effect) {
+ protected AddCardSubTypeTargetEffect(final AddCardSubTypeTargetEffect effect) {
super(effect);
this.addedSubType = effect.addedSubType;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubtypeAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubtypeAllEffect.java
index 07489d7c512..f725618209d 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubtypeAllEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubtypeAllEffect.java
@@ -22,7 +22,7 @@ public class AddCardSubtypeAllEffect extends ContinuousEffectImpl {
addDependencyType(dependency);
}
- public AddCardSubtypeAllEffect(final AddCardSubtypeAllEffect effect) {
+ protected AddCardSubtypeAllEffect(final AddCardSubtypeAllEffect effect) {
super(effect);
filter = effect.filter;
addedSubtype = effect.addedSubtype;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubtypeAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubtypeAttachedEffect.java
index 18bf9b5d70f..3b6114beb3f 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubtypeAttachedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubtypeAttachedEffect.java
@@ -22,7 +22,7 @@ public class AddCardSubtypeAttachedEffect extends ContinuousEffectImpl {
setText();
}
- public AddCardSubtypeAttachedEffect(final AddCardSubtypeAttachedEffect effect) {
+ protected AddCardSubtypeAttachedEffect(final AddCardSubtypeAttachedEffect effect) {
super(effect);
this.addedSubtype = effect.addedSubtype;
this.attachmentType = effect.attachmentType;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSuperTypeAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSuperTypeAttachedEffect.java
index 1b97931cab3..2525b44a3c1 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSuperTypeAttachedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSuperTypeAttachedEffect.java
@@ -23,7 +23,7 @@ public class AddCardSuperTypeAttachedEffect extends ContinuousEffectImpl {
setText();
}
- public AddCardSuperTypeAttachedEffect(final AddCardSuperTypeAttachedEffect effect) {
+ protected AddCardSuperTypeAttachedEffect(final AddCardSuperTypeAttachedEffect effect) {
super(effect);
this.addedSuperType = effect.addedSuperType;
this.attachmentType = effect.attachmentType;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeAttachedEffect.java
index 29dac13f833..fd5ec859c29 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeAttachedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeAttachedEffect.java
@@ -25,7 +25,7 @@ public class AddCardTypeAttachedEffect extends ContinuousEffectImpl {
" in addition to its other types";
}
- public AddCardTypeAttachedEffect(final AddCardTypeAttachedEffect effect) {
+ protected AddCardTypeAttachedEffect(final AddCardTypeAttachedEffect effect) {
super(effect);
this.addedCardType = effect.addedCardType;
this.attachmentType = effect.attachmentType;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeSourceEffect.java
index 384787e6a27..cde16f3fa3c 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeSourceEffect.java
@@ -31,7 +31,7 @@ public class AddCardTypeSourceEffect extends ContinuousEffectImpl {
}
}
- public AddCardTypeSourceEffect(final AddCardTypeSourceEffect effect) {
+ protected AddCardTypeSourceEffect(final AddCardTypeSourceEffect effect) {
super(effect);
this.addedCardTypes.addAll(effect.addedCardTypes);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeTargetEffect.java
index c834b67e628..d695c1e8974 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeTargetEffect.java
@@ -32,7 +32,7 @@ public class AddCardTypeTargetEffect extends ContinuousEffectImpl {
}
- public AddCardTypeTargetEffect(final AddCardTypeTargetEffect effect) {
+ protected AddCardTypeTargetEffect(final AddCardTypeTargetEffect effect) {
super(effect);
this.addedCardTypes.addAll(effect.addedCardTypes);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddChosenSubtypeEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddChosenSubtypeEffect.java
index 1a6a44e2bed..e37f1145dab 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddChosenSubtypeEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddChosenSubtypeEffect.java
@@ -14,7 +14,7 @@ public class AddChosenSubtypeEffect extends ContinuousEffectImpl {
staticText = "{this} is the chosen type in addition to its other types";
}
- public AddChosenSubtypeEffect(final AddChosenSubtypeEffect effect) {
+ protected AddChosenSubtypeEffect(final AddChosenSubtypeEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCreatureTypeAdditionEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCreatureTypeAdditionEffect.java
index 817a3e839ce..c65e9467909 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCreatureTypeAdditionEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCreatureTypeAdditionEffect.java
@@ -21,7 +21,7 @@ public class AddCreatureTypeAdditionEffect extends ContinuousEffectImpl {
updateText();
}
- public AddCreatureTypeAdditionEffect(final AddCreatureTypeAdditionEffect effect) {
+ protected AddCreatureTypeAdditionEffect(final AddCreatureTypeAdditionEffect effect) {
super(effect);
this.subType = effect.subType;
this.giveBlackColor = effect.giveBlackColor;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AssignNoCombatDamageSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AssignNoCombatDamageSourceEffect.java
index fc531058f55..75a25eeae66 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/AssignNoCombatDamageSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AssignNoCombatDamageSourceEffect.java
@@ -9,7 +9,6 @@ import mage.game.events.DamageEvent;
import mage.game.events.GameEvent;
/**
- *
* @author LevelX2
*/
@@ -24,7 +23,7 @@ public class AssignNoCombatDamageSourceEffect extends ReplacementEffectImpl {
staticText = setText(partOfOptionalEffect);
}
- public AssignNoCombatDamageSourceEffect(final AssignNoCombatDamageSourceEffect effect) {
+ protected AssignNoCombatDamageSourceEffect(final AssignNoCombatDamageSourceEffect effect) {
super(effect);
}
@@ -62,7 +61,7 @@ public class AssignNoCombatDamageSourceEffect extends ReplacementEffectImpl {
private String setText(boolean partOfOptionalEffect) {
String text = (partOfOptionalEffect ? "If you do, " : "") + "{this} assigns no combat damage";
- switch(duration) {
+ switch (duration) {
case EndOfTurn:
text += " this turn";
break;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AssignNoCombatDamageTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AssignNoCombatDamageTargetEffect.java
index edd42098190..8c49f78b82d 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/AssignNoCombatDamageTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AssignNoCombatDamageTargetEffect.java
@@ -9,7 +9,6 @@ import mage.game.events.DamageEvent;
import mage.game.events.GameEvent;
/**
- *
* @author awjackson
*/
@@ -24,7 +23,7 @@ public class AssignNoCombatDamageTargetEffect extends ReplacementEffectImpl {
staticText = text;
}
- public AssignNoCombatDamageTargetEffect(final AssignNoCombatDamageTargetEffect effect) {
+ protected AssignNoCombatDamageTargetEffect(final AssignNoCombatDamageTargetEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesAuraSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesAuraSourceEffect.java
index 117cdc55429..03b4e74d9f2 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesAuraSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesAuraSourceEffect.java
@@ -28,7 +28,7 @@ public class BecomesAuraSourceEffect extends ContinuousEffectImpl {
}
- public BecomesAuraSourceEffect(final BecomesAuraSourceEffect effect) {
+ protected BecomesAuraSourceEffect(final BecomesAuraSourceEffect effect) {
super(effect);
this.target = effect.target;
this.newAbility = effect.newAbility;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBasicLandEnchantedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBasicLandEnchantedEffect.java
index 33d5cddc00e..9ae5efffe3b 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBasicLandEnchantedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBasicLandEnchantedEffect.java
@@ -27,7 +27,7 @@ public class BecomesBasicLandEnchantedEffect extends ContinuousEffectImpl {
));
}
- public BecomesBasicLandEnchantedEffect(final BecomesBasicLandEnchantedEffect effect) {
+ protected BecomesBasicLandEnchantedEffect(final BecomesBasicLandEnchantedEffect effect) {
super(effect);
this.landTypes.addAll(effect.landTypes);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBasicLandTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBasicLandTargetEffect.java
index 00b59751b20..7cd72c767a6 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBasicLandTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBasicLandTargetEffect.java
@@ -64,7 +64,7 @@ public class BecomesBasicLandTargetEffect extends ContinuousEffectImpl {
this.loseOther = loseOther;
}
- public BecomesBasicLandTargetEffect(final BecomesBasicLandTargetEffect effect) {
+ protected BecomesBasicLandTargetEffect(final BecomesBasicLandTargetEffect effect) {
super(effect);
this.landTypes.addAll(effect.landTypes);
this.chooseLandType = effect.chooseLandType;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesChosenCreatureTypeSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesChosenCreatureTypeSourceEffect.java
index 4ee8f6462e4..a3e8b55846d 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesChosenCreatureTypeSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesChosenCreatureTypeSourceEffect.java
@@ -29,7 +29,7 @@ public class BecomesChosenCreatureTypeSourceEffect extends OneShotEffect {
staticText = "{this} becomes the creature type of your choice" + (duration == Duration.EndOfTurn ? " until end of turn." : "");
}
- public BecomesChosenCreatureTypeSourceEffect(final BecomesChosenCreatureTypeSourceEffect effect) {
+ protected BecomesChosenCreatureTypeSourceEffect(final BecomesChosenCreatureTypeSourceEffect effect) {
super(effect);
this.nonWall = effect.nonWall;
this.duration = effect.duration;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesChosenCreatureTypeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesChosenCreatureTypeTargetEffect.java
index 8d0620cbee6..6d0ae133a8b 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesChosenCreatureTypeTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesChosenCreatureTypeTargetEffect.java
@@ -31,16 +31,15 @@ public class BecomesChosenCreatureTypeTargetEffect extends OneShotEffect {
super(Outcome.BoostCreature);
this.nonWall = nonWall;
this.duration = duration;
- if(nonWall) {
+ if (nonWall) {
staticText = "choose a creature type other than Wall. Target creature becomes that type until end of turn";
- }
- else {
+ } else {
staticText = "target creature becomes the creature type of your choice until end of turn";
}
}
- public BecomesChosenCreatureTypeTargetEffect(final BecomesChosenCreatureTypeTargetEffect effect) {
+ protected BecomesChosenCreatureTypeTargetEffect(final BecomesChosenCreatureTypeTargetEffect effect) {
super(effect);
this.nonWall = effect.nonWall;
this.duration = effect.duration;
@@ -54,11 +53,11 @@ public class BecomesChosenCreatureTypeTargetEffect extends OneShotEffect {
if (player != null && card != null) {
Choice typeChoice = new ChoiceCreatureType();
String msg = "Choose a creature type";
- if(nonWall) {
+ if (nonWall) {
msg += " other than Wall";
}
typeChoice.setMessage(msg);
- if(nonWall) {
+ if (nonWall) {
typeChoice.getChoices().remove(SubType.WALL.getDescription());
}
while (!player.choose(Outcome.BoostCreature, typeChoice, game)) {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorOrColorsTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorOrColorsTargetEffect.java
index fcd0577de51..f4434ae6fdb 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorOrColorsTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorOrColorsTargetEffect.java
@@ -15,7 +15,6 @@ import mage.players.Player;
import mage.target.targetpointer.FixedTarget;
/**
- *
* @author LevelX2
*/
public class BecomesColorOrColorsTargetEffect extends OneShotEffect {
@@ -34,7 +33,7 @@ public class BecomesColorOrColorsTargetEffect extends OneShotEffect {
this.duration = duration;
}
- public BecomesColorOrColorsTargetEffect(final BecomesColorOrColorsTargetEffect effect) {
+ protected BecomesColorOrColorsTargetEffect(final BecomesColorOrColorsTargetEffect effect) {
super(effect);
this.duration = effect.duration;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorSourceEffect.java
index 5671a4c086c..2bd064558e1 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorSourceEffect.java
@@ -59,7 +59,7 @@ public class BecomesColorSourceEffect extends ContinuousEffectImpl {
this.setColor = setColor;
}
- public BecomesColorSourceEffect(final BecomesColorSourceEffect effect) {
+ protected BecomesColorSourceEffect(final BecomesColorSourceEffect effect) {
super(effect);
this.setColor = effect.setColor;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorTargetEffect.java
index 7ec8fb0f896..35b1e8ab14f 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorTargetEffect.java
@@ -30,6 +30,7 @@
package mage.abilities.effects.common.continuous;
import java.util.UUID;
+
import mage.MageObject;
import mage.ObjectColor;
import mage.abilities.Ability;
@@ -71,7 +72,7 @@ public class BecomesColorTargetEffect extends ContinuousEffectImpl {
staticText = text;
}
- public BecomesColorTargetEffect(final BecomesColorTargetEffect effect) {
+ protected BecomesColorTargetEffect(final BecomesColorTargetEffect effect) {
super(effect);
this.setColor = effect.setColor;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAllEffect.java
index c58e630bc8a..4e95c859d50 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAllEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAllEffect.java
@@ -48,7 +48,7 @@ public class BecomesCreatureAllEffect extends ContinuousEffectImpl {
this.dependencyTypes.add(DependencyType.BecomeCreature);
}
- public BecomesCreatureAllEffect(final BecomesCreatureAllEffect effect) {
+ protected BecomesCreatureAllEffect(final BecomesCreatureAllEffect effect) {
super(effect);
this.token = effect.token.copy();
this.theyAreStillType = effect.theyAreStillType;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedEffect.java
index cda120c4b01..837977fcabc 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedEffect.java
@@ -38,7 +38,7 @@ public class BecomesCreatureAttachedEffect extends ContinuousEffectImpl {
staticText = text;
}
- public BecomesCreatureAttachedEffect(final BecomesCreatureAttachedEffect effect) {
+ protected BecomesCreatureAttachedEffect(final BecomesCreatureAttachedEffect effect) {
super(effect);
this.token = effect.token.copy();
this.type = effect.type;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect.java
index af09a5bbfb2..bd985385be5 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect.java
@@ -24,7 +24,7 @@ public class BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect extends On
this.duration = duration;
}
- public BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect(final BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect effect) {
+ protected BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect(final BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect effect) {
super(effect);
this.token = effect.token.copy();
this.duration = effect.duration;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureIfVehicleEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureIfVehicleEffect.java
index b90851be6d2..e9e9ee45137 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureIfVehicleEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureIfVehicleEffect.java
@@ -18,7 +18,7 @@ public class BecomesCreatureIfVehicleEffect extends ContinuousEffectImpl {
this.staticText = "As long as enchanted permanent is a Vehicle, it's a creature in addition to its other types";
}
- public BecomesCreatureIfVehicleEffect(final BecomesCreatureIfVehicleEffect effect) {
+ protected BecomesCreatureIfVehicleEffect(final BecomesCreatureIfVehicleEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureSourceEffect.java
index d0df9045bd0..2632ec74224 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureSourceEffect.java
@@ -44,9 +44,9 @@ public class BecomesCreatureSourceEffect extends ContinuousEffectImpl {
protected boolean durationRuleAtStart; // put duration rule at the start of the rules text rather than the end
/**
- * @param token Token as blueprint for creature to become
- * @param retainType If null, permanent loses its previous types, otherwise retains types with appropriate text
- * @param duration Duration for the effect
+ * @param token Token as blueprint for creature to become
+ * @param retainType If null, permanent loses its previous types, otherwise retains types with appropriate text
+ * @param duration Duration for the effect
*/
public BecomesCreatureSourceEffect(Token token, CardType retainType, Duration duration) {
super(duration, Outcome.BecomeCreature);
@@ -57,7 +57,7 @@ public class BecomesCreatureSourceEffect extends ContinuousEffectImpl {
this.addDependencyType(DependencyType.BecomeCreature);
}
- public BecomesCreatureSourceEffect(final BecomesCreatureSourceEffect effect) {
+ protected BecomesCreatureSourceEffect(final BecomesCreatureSourceEffect effect) {
super(effect);
this.token = effect.token.copy();
this.retainType = effect.retainType;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTargetEffect.java
index cde78f2c1d3..1131dd6e917 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTargetEffect.java
@@ -59,7 +59,7 @@ public class BecomesCreatureTargetEffect extends ContinuousEffectImpl {
this.dependencyTypes.add(DependencyType.BecomeCreature);
}
- public BecomesCreatureTargetEffect(final BecomesCreatureTargetEffect effect) {
+ protected BecomesCreatureTargetEffect(final BecomesCreatureTargetEffect effect) {
super(effect);
this.token = effect.token.copy();
this.loseAllAbilities = effect.loseAllAbilities;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTypeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTypeTargetEffect.java
index 9fa28ad10ae..b2fcdff6335 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTypeTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTypeTargetEffect.java
@@ -38,7 +38,7 @@ public class BecomesCreatureTypeTargetEffect extends ContinuousEffectImpl {
this.loseOther = loseOther;
}
- public BecomesCreatureTypeTargetEffect(final BecomesCreatureTypeTargetEffect effect) {
+ protected BecomesCreatureTypeTargetEffect(final BecomesCreatureTypeTargetEffect effect) {
super(effect);
this.subtypes.addAll(effect.subtypes);
this.loseOther = effect.loseOther;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesEnchantmentSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesEnchantmentSourceEffect.java
index 90ee1dcbe2e..49eefefa57e 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesEnchantmentSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesEnchantmentSourceEffect.java
@@ -18,7 +18,7 @@ public class BecomesEnchantmentSourceEffect extends ContinuousEffectImpl {
dependencyTypes.add(DependencyType.EnchantmentAddingRemoving);
}
- public BecomesEnchantmentSourceEffect(final BecomesEnchantmentSourceEffect effect) {
+ protected BecomesEnchantmentSourceEffect(final BecomesEnchantmentSourceEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesFaceDownCreatureAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesFaceDownCreatureAllEffect.java
index f58c5c83b32..833bcf58154 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesFaceDownCreatureAllEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesFaceDownCreatureAllEffect.java
@@ -29,7 +29,7 @@ public class BecomesFaceDownCreatureAllEffect extends ContinuousEffectImpl {
staticText = "turn all " + filter.getMessage() + " face down. (They're 2/2 creatures.)";
}
- public BecomesFaceDownCreatureAllEffect(final BecomesFaceDownCreatureAllEffect effect) {
+ protected BecomesFaceDownCreatureAllEffect(final BecomesFaceDownCreatureAllEffect effect) {
super(effect);
for (Map.Entry
* 702.84b If a creature has multiple instances of annihilator, each triggers
* separately.
*
@@ -36,7 +36,7 @@ public class AnnihilatorAbility extends TriggeredAbilityImpl {
this.count = count;
}
- public AnnihilatorAbility(final AnnihilatorAbility ability) {
+ protected AnnihilatorAbility(final AnnihilatorAbility ability) {
super(ability);
this.count = ability.count;
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/AscendAbility.java b/Mage/src/main/java/mage/abilities/keyword/AscendAbility.java
index c4cfbb494eb..5cbbde2208e 100644
--- a/Mage/src/main/java/mage/abilities/keyword/AscendAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/AscendAbility.java
@@ -16,7 +16,6 @@ import mage.game.Game;
import mage.players.Player;
/**
- *
* @author LevelX2
*/
public class AscendAbility extends SimpleStaticAbility {
@@ -27,7 +26,7 @@ public class AscendAbility extends SimpleStaticAbility {
super(Zone.BATTLEFIELD, new AscendContinuousEffect());
}
- public AscendAbility(final AscendAbility ability) {
+ protected AscendAbility(final AscendAbility ability) {
super(ability);
}
@@ -72,7 +71,7 @@ class AscendContinuousEffect extends ContinuousEffectImpl {
staticText = AscendAbility.ASCEND_RULE;
}
- public AscendContinuousEffect(final AscendContinuousEffect effect) {
+ protected AscendContinuousEffect(final AscendContinuousEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/AssistAbility.java b/Mage/src/main/java/mage/abilities/keyword/AssistAbility.java
index aa638d22951..295361da40c 100644
--- a/Mage/src/main/java/mage/abilities/keyword/AssistAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/AssistAbility.java
@@ -1,6 +1,7 @@
package mage.abilities.keyword;
import java.util.UUID;
+
import mage.Mana;
import mage.abilities.Ability;
import mage.abilities.SpecialAction;
@@ -48,7 +49,7 @@ public class AssistAbility extends SimpleStaticAbility implements AlternateManaP
this.setRuleAtTheTop(true);
}
- public AssistAbility(final AssistAbility ability) {
+ protected AssistAbility(final AssistAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/AuraSwapAbility.java b/Mage/src/main/java/mage/abilities/keyword/AuraSwapAbility.java
index 67d51a58634..97cfef65603 100644
--- a/Mage/src/main/java/mage/abilities/keyword/AuraSwapAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/AuraSwapAbility.java
@@ -17,7 +17,6 @@ import mage.players.Player;
import mage.target.common.TargetCardInHand;
/**
- *
* @author Mael
*/
public class AuraSwapAbility extends ActivatedAbilityImpl {
@@ -26,7 +25,7 @@ public class AuraSwapAbility extends ActivatedAbilityImpl {
super(Zone.BATTLEFIELD, new AuraSwapEffect(), manaCost);
}
- public AuraSwapAbility(final AuraSwapAbility ability) {
+ protected AuraSwapAbility(final AuraSwapAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/AwakenAbility.java b/Mage/src/main/java/mage/abilities/keyword/AwakenAbility.java
index 05e057bfec4..ac20c3a4b98 100644
--- a/Mage/src/main/java/mage/abilities/keyword/AwakenAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/AwakenAbility.java
@@ -56,7 +56,7 @@ public class AwakenAbility extends SpellAbility {
+ " +1/+1 counters on target land you control and it becomes a 0/0 Elemental creature with haste. It's still a land.)";
}
- public AwakenAbility(final AwakenAbility ability) {
+ protected AwakenAbility(final AwakenAbility ability) {
super(ability);
this.awakenValue = ability.awakenValue;
this.rule = ability.rule;
@@ -84,7 +84,7 @@ public class AwakenAbility extends SpellAbility {
this.staticText = "put " + CardUtil.numberToText(awakenValue, "a") + " +1/+1 counters on target land you control";
}
- public AwakenEffect(final AwakenEffect effect) {
+ protected AwakenEffect(final AwakenEffect effect) {
super(effect);
}
@@ -142,7 +142,7 @@ class AwakenElementalToken extends TokenImpl {
this.addAbility(HasteAbility.getInstance());
}
- public AwakenElementalToken(final AwakenElementalToken token) {
+ protected AwakenElementalToken(final AwakenElementalToken token) {
super(token);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/BackupAbility.java b/Mage/src/main/java/mage/abilities/keyword/BackupAbility.java
index a57b802a7f2..3a22b6e58a2 100644
--- a/Mage/src/main/java/mage/abilities/keyword/BackupAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/BackupAbility.java
@@ -34,7 +34,7 @@ public class BackupAbility extends EntersBattlefieldTriggeredAbility {
this.addTarget(new TargetCreaturePermanent());
}
- public BackupAbility(final BackupAbility ability) {
+ protected BackupAbility(final BackupAbility ability) {
super(ability);
this.amount = ability.amount;
this.card = ability.card;
@@ -93,7 +93,7 @@ class BackupEffect extends OneShotEffect {
this.abilitiesToAdd.addAll(abilitiesToAdd);
}
- public BackupEffect(final BackupEffect effect) {
+ protected BackupEffect(final BackupEffect effect) {
super(effect);
this.amount = effect.amount;
this.abilitiesToAdd.addAll(effect.abilitiesToAdd);
diff --git a/Mage/src/main/java/mage/abilities/keyword/BasicLandcyclingAbility.java b/Mage/src/main/java/mage/abilities/keyword/BasicLandcyclingAbility.java
index c27ebc3dfc6..6ae6a7a1886 100644
--- a/Mage/src/main/java/mage/abilities/keyword/BasicLandcyclingAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/BasicLandcyclingAbility.java
@@ -6,17 +6,16 @@ import mage.abilities.costs.mana.ManaCosts;
import mage.filter.StaticFilters;
/**
- *
* @author Loki
*/
-public class BasicLandcyclingAbility extends CyclingAbility{
+public class BasicLandcyclingAbility extends CyclingAbility {
private static final String text = "Basic landcycling";
public BasicLandcyclingAbility(ManaCosts costs) {
super(costs, StaticFilters.FILTER_CARD_BASIC_LAND, text);
}
- public BasicLandcyclingAbility(final BasicLandcyclingAbility ability) {
+ protected BasicLandcyclingAbility(final BasicLandcyclingAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/BattalionAbility.java b/Mage/src/main/java/mage/abilities/keyword/BattalionAbility.java
index b9406c02e3c..5672bdff175 100644
--- a/Mage/src/main/java/mage/abilities/keyword/BattalionAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/BattalionAbility.java
@@ -26,7 +26,7 @@ public class BattalionAbility extends TriggeredAbilityImpl {
setTriggerPhrase("Whenever {this} and at least two other creatures attack, ");
}
- public BattalionAbility(final BattalionAbility ability) {
+ protected BattalionAbility(final BattalionAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/BattleCryAbility.java b/Mage/src/main/java/mage/abilities/keyword/BattleCryAbility.java
index 1057188981f..300a48f85e9 100644
--- a/Mage/src/main/java/mage/abilities/keyword/BattleCryAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/BattleCryAbility.java
@@ -13,7 +13,7 @@ public class BattleCryAbility extends AttacksTriggeredAbility {
super(new BoostControlledEffect(1, 0, Duration.EndOfTurn, filter, true), false);
}
- public BattleCryAbility(final BattleCryAbility ability) {
+ protected BattleCryAbility(final BattleCryAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/BestowAbility.java b/Mage/src/main/java/mage/abilities/keyword/BestowAbility.java
index cabbceec8e2..6516b44405e 100644
--- a/Mage/src/main/java/mage/abilities/keyword/BestowAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/BestowAbility.java
@@ -93,7 +93,7 @@ public class BestowAbility extends SpellAbility {
addSubAbility(ability);
}
- public BestowAbility(final BestowAbility ability) {
+ protected BestowAbility(final BestowAbility ability) {
super(ability);
}
@@ -142,7 +142,7 @@ class BestowEntersBattlefieldEffect extends ReplacementEffectImpl {
super(Duration.WhileOnBattlefield, Outcome.Neutral);
}
- public BestowEntersBattlefieldEffect(final BestowEntersBattlefieldEffect effect) {
+ protected BestowEntersBattlefieldEffect(final BestowEntersBattlefieldEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/BloodrushAbility.java b/Mage/src/main/java/mage/abilities/keyword/BloodrushAbility.java
index a89df343cf3..1d52916ed8e 100644
--- a/Mage/src/main/java/mage/abilities/keyword/BloodrushAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/BloodrushAbility.java
@@ -30,7 +30,7 @@ public class BloodrushAbility extends ActivatedAbilityImpl {
this.setAbilityWord(AbilityWord.BLOODRUSH);
}
- public BloodrushAbility(final BloodrushAbility ability) {
+ protected BloodrushAbility(final BloodrushAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/BloodthirstAbility.java b/Mage/src/main/java/mage/abilities/keyword/BloodthirstAbility.java
index 80b1a814bb7..964a7114913 100644
--- a/Mage/src/main/java/mage/abilities/keyword/BloodthirstAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/BloodthirstAbility.java
@@ -3,6 +3,7 @@ package mage.abilities.keyword;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
+
import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldAbility;
import mage.abilities.effects.OneShotEffect;
@@ -15,7 +16,6 @@ import mage.util.CardUtil;
import mage.watchers.common.BloodthirstWatcher;
/**
- *
* @author Loki
*/
public class BloodthirstAbility extends EntersBattlefieldAbility {
@@ -27,7 +27,7 @@ public class BloodthirstAbility extends EntersBattlefieldAbility {
this.amount = amount;
}
- public BloodthirstAbility(final BloodthirstAbility ability) {
+ protected BloodthirstAbility(final BloodthirstAbility ability) {
super(ability);
this.amount = ability.amount;
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/BountyAbility.java b/Mage/src/main/java/mage/abilities/keyword/BountyAbility.java
index 19989d0de77..e2fafe996f9 100644
--- a/Mage/src/main/java/mage/abilities/keyword/BountyAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/BountyAbility.java
@@ -7,7 +7,6 @@ import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
/**
- *
* @author Styxo
*/
public class BountyAbility extends DiesCreatureTriggeredAbility {
@@ -32,7 +31,7 @@ public class BountyAbility extends DiesCreatureTriggeredAbility {
setTriggerPhrase("Bounty — Whenever a creature an opponent controls with a bounty counter on it dies, ");
}
- public BountyAbility(final BountyAbility ability) {
+ protected BountyAbility(final BountyAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/BushidoAbility.java b/Mage/src/main/java/mage/abilities/keyword/BushidoAbility.java
index 044b1b778fb..32ae9920064 100644
--- a/Mage/src/main/java/mage/abilities/keyword/BushidoAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/BushidoAbility.java
@@ -27,8 +27,8 @@ public class BushidoAbility extends BlocksOrBlockedSourceTriggeredAbility {
this.value = value;
rule = (
value instanceof StaticValue ?
- "Bushido " + value.toString() :
- "{this} has bushido X, where X is " + value.getMessage()
+ "Bushido " + value.toString() :
+ "{this} has bushido X, where X is " + value.getMessage()
) + getReminder(value.toString());
}
@@ -36,7 +36,7 @@ public class BushidoAbility extends BlocksOrBlockedSourceTriggeredAbility {
return " (Whenever this creature blocks or becomes blocked, it gets +" + xValue + "/+" + xValue + " until end of turn.)";
}
- public BushidoAbility(final BushidoAbility ability) {
+ protected BushidoAbility(final BushidoAbility ability) {
super(ability);
this.value = ability.value;
this.rule = ability.rule;
diff --git a/Mage/src/main/java/mage/abilities/keyword/BuybackAbility.java b/Mage/src/main/java/mage/abilities/keyword/BuybackAbility.java
index 6dca62861ba..ecb976bc0db 100644
--- a/Mage/src/main/java/mage/abilities/keyword/BuybackAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/BuybackAbility.java
@@ -57,7 +57,7 @@ public class BuybackAbility extends StaticAbility implements OptionalAdditionalS
this.buybackCost.setCostType(VariableCostType.ADDITIONAL);
}
- public BuybackAbility(final BuybackAbility ability) {
+ protected BuybackAbility(final BuybackAbility ability) {
super(ability);
this.buybackCost = ability.buybackCost.copy();
this.amountToReduceBy = ability.amountToReduceBy;
@@ -172,7 +172,7 @@ class BuybackEffect extends ReplacementEffectImpl {
staticText = "When {this} resolves and you payed buyback costs, put it back to hand instead";
}
- public BuybackEffect(final BuybackEffect effect) {
+ protected BuybackEffect(final BuybackEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/ChampionAbility.java b/Mage/src/main/java/mage/abilities/keyword/ChampionAbility.java
index 57bde59e597..e3cadf08061 100644
--- a/Mage/src/main/java/mage/abilities/keyword/ChampionAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/ChampionAbility.java
@@ -102,7 +102,7 @@ public class ChampionAbility extends StaticAbility {
addSubAbility(ability2);
}
- public ChampionAbility(final ChampionAbility ability) {
+ protected ChampionAbility(final ChampionAbility ability) {
super(ability);
this.objectDescription = ability.objectDescription;
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/ChannelAbility.java b/Mage/src/main/java/mage/abilities/keyword/ChannelAbility.java
index 3ca999b0b8f..8c82551b99e 100644
--- a/Mage/src/main/java/mage/abilities/keyword/ChannelAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/ChannelAbility.java
@@ -22,7 +22,7 @@ public class ChannelAbility extends ActivatedAbilityImpl {
this.setAbilityWord(AbilityWord.CHANNEL);
}
- public ChannelAbility(final ChannelAbility ability) {
+ protected ChannelAbility(final ChannelAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/CleaveAbility.java b/Mage/src/main/java/mage/abilities/keyword/CleaveAbility.java
index 2bccbe68404..131a83f9ae4 100644
--- a/Mage/src/main/java/mage/abilities/keyword/CleaveAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/CleaveAbility.java
@@ -20,7 +20,7 @@ public class CleaveAbility extends SpellAbility {
this.timing = (card.isSorcery(null) ? TimingRule.SORCERY : TimingRule.INSTANT);
}
- public CleaveAbility(final CleaveAbility ability) {
+ protected CleaveAbility(final CleaveAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/ConspireAbility.java b/Mage/src/main/java/mage/abilities/keyword/ConspireAbility.java
index b5c0e987399..ab4eee7ef30 100644
--- a/Mage/src/main/java/mage/abilities/keyword/ConspireAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/ConspireAbility.java
@@ -91,7 +91,7 @@ public class ConspireAbility extends StaticAbility implements OptionalAdditional
this.addSubAbility(new ConspireTriggeredAbility(conspireId));
}
- public ConspireAbility(final ConspireAbility ability) {
+ protected ConspireAbility(final ConspireAbility ability) {
super(ability);
this.conspireId = ability.conspireId;
this.addedById = ability.addedById;
diff --git a/Mage/src/main/java/mage/abilities/keyword/ConvokeAbility.java b/Mage/src/main/java/mage/abilities/keyword/ConvokeAbility.java
index e20810067c0..43e679f3330 100644
--- a/Mage/src/main/java/mage/abilities/keyword/ConvokeAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/ConvokeAbility.java
@@ -84,7 +84,7 @@ public class ConvokeAbility extends SimpleStaticAbility implements AlternateMana
this.addHint(new ValueHint("Untapped creatures you control", new PermanentsOnBattlefieldCount(filterUntapped)));
}
- public ConvokeAbility(final ConvokeAbility ability) {
+ protected ConvokeAbility(final ConvokeAbility ability) {
super(ability);
}
@@ -180,7 +180,7 @@ class ConvokeSpecialAction extends SpecialAction {
this.addEffect(new ConvokeEffect(unpaid));
}
- public ConvokeSpecialAction(final ConvokeSpecialAction ability) {
+ protected ConvokeSpecialAction(final ConvokeSpecialAction ability) {
super(ability);
}
@@ -200,7 +200,7 @@ class ConvokeEffect extends OneShotEffect {
this.staticText = "Convoke (Your creatures can help cast this spell. Each creature you tap while casting this spell pays for {1} or one mana of that creature's color.)";
}
- public ConvokeEffect(final ConvokeEffect effect) {
+ protected ConvokeEffect(final ConvokeEffect effect) {
super(effect);
this.unpaid = effect.unpaid;
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/CrewAbility.java b/Mage/src/main/java/mage/abilities/keyword/CrewAbility.java
index a2b7c707405..2c35e7f17df 100644
--- a/Mage/src/main/java/mage/abilities/keyword/CrewAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/CrewAbility.java
@@ -58,7 +58,7 @@ public class CrewAbility extends SimpleActivatedAbility {
}
}
- public CrewAbility(final CrewAbility ability) {
+ protected CrewAbility(final CrewAbility ability) {
super(ability);
this.value = ability.value;
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/CumulativeUpkeepAbility.java b/Mage/src/main/java/mage/abilities/keyword/CumulativeUpkeepAbility.java
index 2281feb5ae5..ab31a74849c 100644
--- a/Mage/src/main/java/mage/abilities/keyword/CumulativeUpkeepAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/CumulativeUpkeepAbility.java
@@ -21,7 +21,6 @@ import mage.players.Player;
import mage.util.CardUtil;
/**
- *
* @author Plopman
*/
public class CumulativeUpkeepAbility extends BeginningOfUpkeepTriggeredAbility {
@@ -34,7 +33,7 @@ public class CumulativeUpkeepAbility extends BeginningOfUpkeepTriggeredAbility {
this.cumulativeCost = cumulativeCost;
}
- public CumulativeUpkeepAbility(final CumulativeUpkeepAbility ability) {
+ protected CumulativeUpkeepAbility(final CumulativeUpkeepAbility ability) {
super(ability);
this.cumulativeCost = ability.cumulativeCost.copy();
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/CyclingAbility.java b/Mage/src/main/java/mage/abilities/keyword/CyclingAbility.java
index fa634a37c65..2dd33a99fca 100644
--- a/Mage/src/main/java/mage/abilities/keyword/CyclingAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/CyclingAbility.java
@@ -33,7 +33,7 @@ public class CyclingAbility extends ActivatedAbilityImpl {
this.text = text;
}
- public CyclingAbility(final CyclingAbility ability) {
+ protected CyclingAbility(final CyclingAbility ability) {
super(ability);
this.cost = ability.cost;
this.text = ability.text;
diff --git a/Mage/src/main/java/mage/abilities/keyword/DelveAbility.java b/Mage/src/main/java/mage/abilities/keyword/DelveAbility.java
index 66e2b42cb9c..f793e3e4ce8 100644
--- a/Mage/src/main/java/mage/abilities/keyword/DelveAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/DelveAbility.java
@@ -69,7 +69,7 @@ public class DelveAbility extends SimpleStaticAbility implements AlternateManaPa
this.addHint(new ValueHint("Cards in your graveyard", cardsInGraveyard));
}
- public DelveAbility(final DelveAbility ability) {
+ protected DelveAbility(final DelveAbility ability) {
super(ability);
}
@@ -130,7 +130,7 @@ class DelveSpecialAction extends SpecialAction {
this.addEffect(new DelveEffect());
}
- public DelveSpecialAction(final DelveSpecialAction ability) {
+ protected DelveSpecialAction(final DelveSpecialAction ability) {
super(ability);
}
@@ -147,7 +147,7 @@ class DelveEffect extends OneShotEffect {
this.staticText = "Delve (Each card you exile from your graveyard while casting this spell pays for {1}.)";
}
- public DelveEffect(final DelveEffect effect) {
+ protected DelveEffect(final DelveEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/DethroneAbility.java b/Mage/src/main/java/mage/abilities/keyword/DethroneAbility.java
index 7275c54a948..77b6613da96 100644
--- a/Mage/src/main/java/mage/abilities/keyword/DethroneAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/DethroneAbility.java
@@ -2,6 +2,7 @@
package mage.abilities.keyword;
import java.util.UUID;
+
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.common.counter.AddCountersSourceEffect;
import mage.constants.Zone;
@@ -30,7 +31,7 @@ public class DethroneAbility extends TriggeredAbilityImpl {
super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false);
}
- public DethroneAbility(final DethroneAbility ability) {
+ protected DethroneAbility(final DethroneAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/DevoidAbility.java b/Mage/src/main/java/mage/abilities/keyword/DevoidAbility.java
index 2054a0623f5..a6329e28425 100644
--- a/Mage/src/main/java/mage/abilities/keyword/DevoidAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/DevoidAbility.java
@@ -5,7 +5,6 @@ import mage.abilities.common.SimpleStaticAbility;
import mage.constants.Zone;
/**
- *
* @author LevelX2
*/
public class DevoidAbility extends SimpleStaticAbility {
@@ -20,7 +19,7 @@ public class DevoidAbility extends SimpleStaticAbility {
setRuleAtTheTop(true);
}
- public DevoidAbility(final DevoidAbility ability) {
+ protected DevoidAbility(final DevoidAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/DredgeAbility.java b/Mage/src/main/java/mage/abilities/keyword/DredgeAbility.java
index c628b3c71c7..10843323d5e 100644
--- a/Mage/src/main/java/mage/abilities/keyword/DredgeAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/DredgeAbility.java
@@ -25,7 +25,7 @@ public class DredgeAbility extends SimpleStaticAbility {
super(Zone.GRAVEYARD, new DredgeEffect(value));
}
- public DredgeAbility(final DredgeAbility ability) {
+ protected DredgeAbility(final DredgeAbility ability) {
super(ability);
}
@@ -47,7 +47,7 @@ class DredgeEffect extends ReplacementEffectImpl {
+ " instead. If you do, return this card from your graveyard to your hand.)";
}
- public DredgeEffect(final DredgeEffect effect) {
+ protected DredgeEffect(final DredgeEffect effect) {
super(effect);
this.amount = effect.amount;
}
@@ -72,7 +72,7 @@ class DredgeEffect extends ReplacementEffectImpl {
if (owner != null
&& owner.getLibrary().size() >= amount
&& owner.chooseUse(outcome, new StringBuilder("Dredge ").append(sourceCard.getLogName()).
- append("? (").append(amount).append(" cards are milled)").toString(), source, game)) {
+ append("? (").append(amount).append(" cards are milled)").toString(), source, game)) {
if (!game.isSimulation()) {
game.informPlayers(new StringBuilder(owner.getLogName()).append(" dredges ").append(sourceCard.getLogName()).toString());
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/EchoAbility.java b/Mage/src/main/java/mage/abilities/keyword/EchoAbility.java
index 2402dbe1df6..e52e1bc8c95 100644
--- a/Mage/src/main/java/mage/abilities/keyword/EchoAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/EchoAbility.java
@@ -52,7 +52,7 @@ public class EchoAbility extends TriggeredAbilityImpl {
this.rule = null;
}
- public EchoAbility(final EchoAbility ability) {
+ protected EchoAbility(final EchoAbility ability) {
super(ability);
this.echoPaid = ability.echoPaid;
this.echoCosts = ability.echoCosts.copy();
diff --git a/Mage/src/main/java/mage/abilities/keyword/EmbalmAbility.java b/Mage/src/main/java/mage/abilities/keyword/EmbalmAbility.java
index 38c6ec43709..0b3408c0d76 100644
--- a/Mage/src/main/java/mage/abilities/keyword/EmbalmAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/EmbalmAbility.java
@@ -33,7 +33,7 @@ public class EmbalmAbility extends ActivatedAbilityImpl {
this.timing = TimingRule.SORCERY;
}
- public EmbalmAbility(final EmbalmAbility ability) {
+ protected EmbalmAbility(final EmbalmAbility ability) {
super(ability);
this.rule = ability.rule;
}
@@ -66,7 +66,7 @@ class EmbalmEffect extends OneShotEffect {
super(Outcome.PutCreatureInPlay);
}
- public EmbalmEffect(final EmbalmEffect effect) {
+ protected EmbalmEffect(final EmbalmEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/EmergeAbility.java b/Mage/src/main/java/mage/abilities/keyword/EmergeAbility.java
index a0f1d1dd3bf..90f70b51b18 100644
--- a/Mage/src/main/java/mage/abilities/keyword/EmergeAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/EmergeAbility.java
@@ -38,10 +38,10 @@ public class EmergeAbility extends SpellAbility {
this.getManaCostsToPay().clear();
this.addManaCost(emergeCost.copy());
- this.setRuleAtTheTop(true);
+ this.setRuleAtTheTop(true);
}
- public EmergeAbility(final EmergeAbility ability) {
+ protected EmergeAbility(final EmergeAbility ability) {
super(ability);
this.emergeCost = ability.emergeCost.copy();
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/EnchantAbility.java b/Mage/src/main/java/mage/abilities/keyword/EnchantAbility.java
index 6dbdb501b4c..43d30217dda 100644
--- a/Mage/src/main/java/mage/abilities/keyword/EnchantAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/EnchantAbility.java
@@ -6,7 +6,6 @@ import mage.abilities.StaticAbility;
import mage.target.Target;
/**
- *
* @author BetaSteward_at_googlemail.com
* @author North
*/
@@ -19,7 +18,7 @@ public class EnchantAbility extends StaticAbility {
this.targetName = target.getTargetName();
}
- public EnchantAbility(final EnchantAbility ability) {
+ protected EnchantAbility(final EnchantAbility ability) {
super(ability);
this.targetName = ability.targetName;
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/EncoreAbility.java b/Mage/src/main/java/mage/abilities/keyword/EncoreAbility.java
index c52d4ff836e..729b871b164 100644
--- a/Mage/src/main/java/mage/abilities/keyword/EncoreAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/EncoreAbility.java
@@ -40,7 +40,7 @@ public class EncoreAbility extends ActivatedAbilityImpl {
this.rule = setRule(cost);
}
- public EncoreAbility(final EncoreAbility ability) {
+ protected EncoreAbility(final EncoreAbility ability) {
super(ability);
this.rule = ability.rule;
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/EntwineAbility.java b/Mage/src/main/java/mage/abilities/keyword/EntwineAbility.java
index 8bd4837f339..e363440d22b 100644
--- a/Mage/src/main/java/mage/abilities/keyword/EntwineAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/EntwineAbility.java
@@ -57,7 +57,7 @@ public class EntwineAbility extends StaticAbility implements OptionalAdditionalM
this.entwineCost.setCostType(VariableCostType.ADDITIONAL);
}
- public EntwineAbility(final EntwineAbility ability) {
+ protected EntwineAbility(final EntwineAbility ability) {
super(ability);
if (ability.entwineCost != null) {
this.entwineCost = ability.entwineCost.copy();
diff --git a/Mage/src/main/java/mage/abilities/keyword/EscalateAbility.java b/Mage/src/main/java/mage/abilities/keyword/EscalateAbility.java
index 4a552751e49..0ce0a51df63 100644
--- a/Mage/src/main/java/mage/abilities/keyword/EscalateAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/EscalateAbility.java
@@ -13,7 +13,6 @@ import mage.constants.Zone;
import mage.game.Game;
/**
- *
* @author emerald000
*/
public class EscalateAbility extends SimpleStaticAbility {
@@ -23,7 +22,7 @@ public class EscalateAbility extends SimpleStaticAbility {
this.setRuleAtTheTop(true);
}
- public EscalateAbility(final EscalateAbility ability) {
+ protected EscalateAbility(final EscalateAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/EternalizeAbility.java b/Mage/src/main/java/mage/abilities/keyword/EternalizeAbility.java
index 1648f608a5d..f7752278f49 100644
--- a/Mage/src/main/java/mage/abilities/keyword/EternalizeAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/EternalizeAbility.java
@@ -37,7 +37,7 @@ public class EternalizeAbility extends ActivatedAbilityImpl {
this.timing = TimingRule.SORCERY;
}
- public EternalizeAbility(final EternalizeAbility ability) {
+ protected EternalizeAbility(final EternalizeAbility ability) {
super(ability);
this.rule = ability.rule;
}
@@ -70,7 +70,7 @@ class EternalizeEffect extends OneShotEffect {
super(Outcome.PutCreatureInPlay);
}
- public EternalizeEffect(final EternalizeEffect effect) {
+ protected EternalizeEffect(final EternalizeEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/EvolveAbility.java b/Mage/src/main/java/mage/abilities/keyword/EvolveAbility.java
index a21215356e3..4caf6ce7a30 100644
--- a/Mage/src/main/java/mage/abilities/keyword/EvolveAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/EvolveAbility.java
@@ -106,7 +106,7 @@ class EvolveEffect extends OneShotEffect {
super(Outcome.BoostCreature);
}
- public EvolveEffect(final EvolveEffect effect) {
+ protected EvolveEffect(final EvolveEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/ExertAbility.java b/Mage/src/main/java/mage/abilities/keyword/ExertAbility.java
index 5e703804dac..a38b498b8da 100644
--- a/Mage/src/main/java/mage/abilities/keyword/ExertAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/ExertAbility.java
@@ -3,6 +3,7 @@ package mage.abilities.keyword;
import java.util.HashSet;
import java.util.Set;
+
import mage.MageObjectReference;
import mage.abilities.Ability;
import mage.abilities.Mode;
@@ -23,7 +24,6 @@ import mage.target.targetpointer.FixedTarget;
import mage.watchers.Watcher;
/**
- *
* @author LevelX2
*/
public class ExertAbility extends SimpleStaticAbility {
@@ -54,7 +54,7 @@ public class ExertAbility extends SimpleStaticAbility {
}
}
- public ExertAbility(final ExertAbility ability) {
+ protected ExertAbility(final ExertAbility ability) {
super(ability);
this.ruleText = ability.ruleText;
diff --git a/Mage/src/main/java/mage/abilities/keyword/ExploitAbility.java b/Mage/src/main/java/mage/abilities/keyword/ExploitAbility.java
index 9f076e5352d..6da15f0b19c 100644
--- a/Mage/src/main/java/mage/abilities/keyword/ExploitAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/ExploitAbility.java
@@ -14,59 +14,59 @@ import mage.target.Target;
import mage.target.TargetPermanent;
/**
- * Exploit is the signature ability of the blue-black Silumgar clan. When a creature with exploit
+ * Exploit is the signature ability of the blue-black Silumgar clan. When a creature with exploit
* enters the battlefield, you may sacrifice a creature you control.
- *
- * But you're not just sacrificing your loyal minions for fun. Each creature with exploit has
+ *
+ * But you're not just sacrificing your loyal minions for fun. Each creature with exploit has
* another ability that gives you a benefit when it "exploits a creature." This means when you
- * sacrifice a creature because of its exploit ability. That ability doesn't trigger if you
+ * sacrifice a creature because of its exploit ability. That ability doesn't trigger if you
* sacrifice a creature for any other reason, including the exploit ability of a different creature.
- *
+ *
* You can sacrifice any creature you control when the exploit ability resolves, including the creature
* with exploit itself. You don't have to sacrifice a creature if you don't want to. If you do, you choose
* which one as the exploit ability resolves. To get the most out of your minions, look for creatures
* with abilities that give you an added benefit when they die.
- *
+ *
* @author LevelX2
*/
public class ExploitAbility extends EntersBattlefieldTriggeredAbility {
-
+
public ExploitAbility() {
super(new ExploitEffect(), true);
}
-
- public ExploitAbility(final ExploitAbility ability) {
+
+ protected ExploitAbility(final ExploitAbility ability) {
super(ability);
}
-
+
@Override
public ExploitAbility copy() {
return new ExploitAbility(this);
- }
+ }
@Override
public String getRule() {
return "Exploit (When this creature enters the battlefield, you may sacrifice a creature.)";
}
-
+
}
class ExploitEffect extends OneShotEffect {
-
+
public ExploitEffect() {
super(Outcome.Detriment);
this.staticText = "you may sacrifice a creature";
}
-
- public ExploitEffect(final ExploitEffect effect) {
+
+ protected ExploitEffect(final ExploitEffect effect) {
super(effect);
}
-
+
@Override
public ExploitEffect copy() {
return new ExploitEffect(this);
}
-
+
@Override
public boolean apply(Game game, Ability source) {
Player controller = game.getPlayer(source.getControllerId());
@@ -75,14 +75,14 @@ class ExploitEffect extends OneShotEffect {
if (target.canChoose(controller.getId(), source, game)) {
controller.chooseTarget(Outcome.Sacrifice, target, source, game);
Permanent permanent = game.getPermanent(target.getFirstTarget());
- if (permanent != null ) {
+ if (permanent != null) {
if (permanent.sacrifice(source, game)) {
game.fireEvent(GameEvent.getEvent(GameEvent.EventType.EXPLOITED_CREATURE, permanent.getId(), source, controller.getId()));
}
- }
+ }
}
return true;
- }
+ }
return false;
}
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/ExtortAbility.java b/Mage/src/main/java/mage/abilities/keyword/ExtortAbility.java
index cb2d97be0d3..a632afe486f 100644
--- a/Mage/src/main/java/mage/abilities/keyword/ExtortAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/ExtortAbility.java
@@ -18,13 +18,13 @@ import java.util.UUID;
/**
* FAQ 2013/01/11
- *
+ *
* 702.99. Extort
- *
+ *
* 702.99a Extort is a triggered ability. "Extort" means "Whenever you cast a spell,
* you may pay White or Black Mana. If you do, each opponent loses 1 life and you gain
* life equal to the total life lost this way."
- *
+ *
* 702.99b If a permanent has multiple instances of extort, each triggers separately.
*
* @author LevelX2
@@ -35,7 +35,7 @@ public class ExtortAbility extends TriggeredAbilityImpl {
super(Zone.BATTLEFIELD, new ExtortEffect(), false);
}
- public ExtortAbility(final ExtortAbility ability) {
+ protected ExtortAbility(final ExtortAbility ability) {
super(ability);
}
@@ -66,7 +66,7 @@ class ExtortEffect extends OneShotEffect {
staticText = "each opponent loses 1 life and you gain that much life";
}
- public ExtortEffect(final ExtortEffect effect) {
+ protected ExtortEffect(final ExtortEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/FabricateAbility.java b/Mage/src/main/java/mage/abilities/keyword/FabricateAbility.java
index 2f22884f98a..ab6b2beeb48 100644
--- a/Mage/src/main/java/mage/abilities/keyword/FabricateAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/FabricateAbility.java
@@ -25,7 +25,7 @@ public class FabricateAbility extends EntersBattlefieldTriggeredAbility {
this.value = value;
}
- public FabricateAbility(final FabricateAbility ability) {
+ protected FabricateAbility(final FabricateAbility ability) {
super(ability);
this.value = ability.value;
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/FadingAbility.java b/Mage/src/main/java/mage/abilities/keyword/FadingAbility.java
index 88cfd4fedca..728e431234e 100644
--- a/Mage/src/main/java/mage/abilities/keyword/FadingAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/FadingAbility.java
@@ -45,11 +45,11 @@ public class FadingAbility extends EntersBattlefieldAbility {
}
ruleText = "Fading " + fadeCounter
+ (shortRuleText ? ""
- : " (This " + cardTypeName + " enters the battlefield with " + CardUtil.numberToText(fadeCounter) + " fade counters on it."
- + " At the beginning of your upkeep, remove a fade counter from it. If you can't, sacrifice it.)");
+ : " (This " + cardTypeName + " enters the battlefield with " + CardUtil.numberToText(fadeCounter) + " fade counters on it."
+ + " At the beginning of your upkeep, remove a fade counter from it. If you can't, sacrifice it.)");
}
- public FadingAbility(final FadingAbility ability) {
+ protected FadingAbility(final FadingAbility ability) {
super(ability);
this.ruleText = ability.ruleText;
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/FearAbility.java b/Mage/src/main/java/mage/abilities/keyword/FearAbility.java
index 183e79d4f11..c3287d2cb30 100644
--- a/Mage/src/main/java/mage/abilities/keyword/FearAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/FearAbility.java
@@ -47,7 +47,7 @@ class FearEffect extends RestrictionEffect implements MageSingleton {
super(Duration.EndOfGame);
}
- public FearEffect(final FearEffect effect) {
+ protected FearEffect(final FearEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/FlankingAbility.java b/Mage/src/main/java/mage/abilities/keyword/FlankingAbility.java
index 6a46885ee18..88504d87b50 100644
--- a/Mage/src/main/java/mage/abilities/keyword/FlankingAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/FlankingAbility.java
@@ -19,7 +19,7 @@ public class FlankingAbility extends TriggeredAbilityImpl {
super(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), false);
}
- public FlankingAbility(final FlankingAbility ability) {
+ protected FlankingAbility(final FlankingAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/FlashbackAbility.java b/Mage/src/main/java/mage/abilities/keyword/FlashbackAbility.java
index 7cc6d3411fd..a3640747bb0 100644
--- a/Mage/src/main/java/mage/abilities/keyword/FlashbackAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/FlashbackAbility.java
@@ -46,7 +46,7 @@ public class FlashbackAbility extends SpellAbility {
this.timing = card.isSorcery() ? TimingRule.SORCERY : TimingRule.INSTANT;
}
- public FlashbackAbility(final FlashbackAbility ability) {
+ protected FlashbackAbility(final FlashbackAbility ability) {
super(ability);
this.spellAbilityType = ability.spellAbilityType;
this.abilityName = ability.abilityName;
@@ -191,7 +191,7 @@ class FlashbackReplacementEffect extends ReplacementEffectImpl {
staticText = "(If the flashback cost was paid, exile this card instead of putting it anywhere else any time it would leave the stack)";
}
- public FlashbackReplacementEffect(final FlashbackReplacementEffect effect) {
+ protected FlashbackReplacementEffect(final FlashbackReplacementEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/FlyingAbility.java b/Mage/src/main/java/mage/abilities/keyword/FlyingAbility.java
index 36b727bec1d..d7a7b55ecf2 100644
--- a/Mage/src/main/java/mage/abilities/keyword/FlyingAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/FlyingAbility.java
@@ -55,7 +55,7 @@ class FlyingEffect extends RestrictionEffect implements MageSingleton {
super(Duration.EndOfGame);
}
- public FlyingEffect(final FlyingEffect effect) {
+ protected FlyingEffect(final FlyingEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/ForMirrodinAbility.java b/Mage/src/main/java/mage/abilities/keyword/ForMirrodinAbility.java
index 371c1672213..7136be07080 100644
--- a/Mage/src/main/java/mage/abilities/keyword/ForMirrodinAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/ForMirrodinAbility.java
@@ -14,7 +14,7 @@ public class ForMirrodinAbility extends EntersBattlefieldTriggeredAbility {
super(new CreateTokenAttachSourceEffect(new RebelRedToken()));
}
- public ForMirrodinAbility(final ForMirrodinAbility ability) {
+ protected ForMirrodinAbility(final ForMirrodinAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/ForecastAbility.java b/Mage/src/main/java/mage/abilities/keyword/ForecastAbility.java
index c1a7c99fdd6..00e28429ab3 100644
--- a/Mage/src/main/java/mage/abilities/keyword/ForecastAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/ForecastAbility.java
@@ -35,7 +35,7 @@ public class ForecastAbility extends ActivatedAbilityImpl {
this.addCost(new RevealSourceFromYourHandCost());
}
- public ForecastAbility(final ForecastAbility ability) {
+ protected ForecastAbility(final ForecastAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/ForestcyclingAbility.java b/Mage/src/main/java/mage/abilities/keyword/ForestcyclingAbility.java
index 8f35e1c7bfa..b8b29b71ee3 100644
--- a/Mage/src/main/java/mage/abilities/keyword/ForestcyclingAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/ForestcyclingAbility.java
@@ -7,13 +7,13 @@ import mage.constants.SubType;
import mage.filter.common.FilterLandCard;
/**
- *
* @author Plopman
*/
-public class ForestcyclingAbility extends CyclingAbility{
+public class ForestcyclingAbility extends CyclingAbility {
private static final FilterLandCard filter = new FilterLandCard("Forest card");
private static final String text = "Forestcycling";
- static{
+
+ static {
filter.add(SubType.FOREST.getPredicate());
}
@@ -21,7 +21,7 @@ public class ForestcyclingAbility extends CyclingAbility{
super(costs, filter, text);
}
- public ForestcyclingAbility(final ForestcyclingAbility ability) {
+ protected ForestcyclingAbility(final ForestcyclingAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/ForestwalkAbility.java b/Mage/src/main/java/mage/abilities/keyword/ForestwalkAbility.java
index 2e948bcfd3a..f3741369714 100644
--- a/Mage/src/main/java/mage/abilities/keyword/ForestwalkAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/ForestwalkAbility.java
@@ -6,7 +6,6 @@ import mage.filter.common.FilterControlledLandPermanent;
import mage.filter.common.FilterLandPermanent;
/**
- *
* @author BetaSteward_at_googlemail.com
*/
public class ForestwalkAbility extends LandwalkAbility {
@@ -25,7 +24,7 @@ public class ForestwalkAbility extends LandwalkAbility {
super(filter, withHintText);
}
- public ForestwalkAbility(final ForestwalkAbility ability) {
+ protected ForestwalkAbility(final ForestwalkAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/ForetellAbility.java b/Mage/src/main/java/mage/abilities/keyword/ForetellAbility.java
index 887f5bcd566..db5b65214ce 100644
--- a/Mage/src/main/java/mage/abilities/keyword/ForetellAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/ForetellAbility.java
@@ -103,7 +103,7 @@ public class ForetellAbility extends SpecialAction {
this.foretellSplitCost = foretellSplitCost;
}
- public ForetellExileEffect(final ForetellExileEffect effect) {
+ protected ForetellExileEffect(final ForetellExileEffect effect) {
super(effect);
this.card = effect.card;
this.foretellCost = effect.foretellCost;
@@ -156,7 +156,7 @@ public class ForetellAbility extends SpecialAction {
super(AsThoughEffectType.LOOK_AT_FACE_DOWN, Duration.EndOfGame, Outcome.AIDontUseIt);
}
- public ForetellLookAtCardEffect(final ForetellLookAtCardEffect effect) {
+ protected ForetellLookAtCardEffect(final ForetellLookAtCardEffect effect) {
super(effect);
}
@@ -200,7 +200,7 @@ public class ForetellAbility extends SpecialAction {
staticText = "Foretold card";
}
- public ForetellAddCostEffect(final ForetellAddCostEffect effect) {
+ protected ForetellAddCostEffect(final ForetellAddCostEffect effect) {
super(effect);
this.mor = effect.mor;
}
@@ -315,7 +315,7 @@ public class ForetellAbility extends SpecialAction {
this.addCost(new ManaCostsImpl<>(foretellCost));
}
- public ForetellCostAbility(final ForetellCostAbility ability) {
+ protected ForetellCostAbility(final ForetellCostAbility ability) {
super(ability);
this.spellAbilityType = ability.spellAbilityType;
this.abilityName = ability.abilityName;
diff --git a/Mage/src/main/java/mage/abilities/keyword/FortifyAbility.java b/Mage/src/main/java/mage/abilities/keyword/FortifyAbility.java
index be1b1ea368a..2d9937899ed 100644
--- a/Mage/src/main/java/mage/abilities/keyword/FortifyAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/FortifyAbility.java
@@ -32,7 +32,7 @@ public class FortifyAbility extends ActivatedAbilityImpl {
this.timing = TimingRule.SORCERY;
}
- public FortifyAbility(final FortifyAbility ability) {
+ protected FortifyAbility(final FortifyAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/GraftAbility.java b/Mage/src/main/java/mage/abilities/keyword/GraftAbility.java
index bc588c22f2b..6663d65b3c2 100644
--- a/Mage/src/main/java/mage/abilities/keyword/GraftAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/GraftAbility.java
@@ -2,6 +2,7 @@
package mage.abilities.keyword;
import java.util.Locale;
+
import mage.abilities.Ability;
import mage.abilities.StaticAbility;
import mage.abilities.TriggeredAbilityImpl;
@@ -27,7 +28,7 @@ import mage.util.CardUtil;
* counters on it" and, "Whenever another creature enters the battlefield, if
* this permanent has a +1/+1 counter on it, you may move a +1/+1 counter from
* this permanent onto that creature."
- *
+ *
* 702.56b. If a creature has multiple instances of graft, each one works
* separately.
*
@@ -51,7 +52,7 @@ public class GraftAbility extends TriggeredAbilityImpl {
addSubAbility(new GraftStaticAbility(amount));
}
- public GraftAbility(final GraftAbility ability) {
+ protected GraftAbility(final GraftAbility ability) {
super(ability);
this.amount = ability.amount;
this.cardtype = ability.cardtype;
@@ -106,7 +107,7 @@ class GraftStaticAbility extends StaticAbility {
this.setRuleVisible(false);
}
- public GraftStaticAbility(final GraftStaticAbility ability) {
+ protected GraftStaticAbility(final GraftStaticAbility ability) {
super(ability);
this.ruleText = ability.ruleText;
}
@@ -129,7 +130,7 @@ class GraftDistributeCounterEffect extends OneShotEffect {
this.staticText = "you may move a +1/+1 counter from this permanent onto it";
}
- public GraftDistributeCounterEffect(final GraftDistributeCounterEffect effect) {
+ protected GraftDistributeCounterEffect(final GraftDistributeCounterEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/HeroicAbility.java b/Mage/src/main/java/mage/abilities/keyword/HeroicAbility.java
index 18cadb4c6f9..a7e22c11e43 100644
--- a/Mage/src/main/java/mage/abilities/keyword/HeroicAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/HeroicAbility.java
@@ -38,7 +38,7 @@ public class HeroicAbility extends TriggeredAbilityImpl {
setTriggerPhrase("Whenever you cast a spell that targets {this}, ");
}
- public HeroicAbility(final HeroicAbility ability) {
+ protected HeroicAbility(final HeroicAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/HorsemanshipAbility.java b/Mage/src/main/java/mage/abilities/keyword/HorsemanshipAbility.java
index fdc0d8e7187..a86a1ae7ba0 100644
--- a/Mage/src/main/java/mage/abilities/keyword/HorsemanshipAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/HorsemanshipAbility.java
@@ -47,7 +47,7 @@ class Horsemanship extends RestrictionEffect implements MageSingleton {
super(Duration.EndOfGame);
}
- public Horsemanship(final Horsemanship effect) {
+ protected Horsemanship(final Horsemanship effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/ImproviseAbility.java b/Mage/src/main/java/mage/abilities/keyword/ImproviseAbility.java
index 1ca8ddec932..2b8865e2c91 100644
--- a/Mage/src/main/java/mage/abilities/keyword/ImproviseAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/ImproviseAbility.java
@@ -58,7 +58,7 @@ public class ImproviseAbility extends SimpleStaticAbility implements AlternateMa
this.addHint(new ValueHint("Untapped artifacts you control", untappedCount));
}
- public ImproviseAbility(final ImproviseAbility ability) {
+ protected ImproviseAbility(final ImproviseAbility ability) {
super(ability);
}
@@ -119,7 +119,7 @@ class ImproviseSpecialAction extends SpecialAction {
this.addEffect(new ImproviseEffect(unpaid));
}
- public ImproviseSpecialAction(final ImproviseSpecialAction ability) {
+ protected ImproviseSpecialAction(final ImproviseSpecialAction ability) {
super(ability);
}
@@ -139,7 +139,7 @@ class ImproviseEffect extends OneShotEffect {
this.staticText = "Improvise (Your artifacts can help cast this spell. Each artifact you tap after you're done activating mana abilities pays for {1}.)";
}
- public ImproviseEffect(final ImproviseEffect effect) {
+ protected ImproviseEffect(final ImproviseEffect effect) {
super(effect);
this.unpaid = effect.unpaid;
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/IngestAbility.java b/Mage/src/main/java/mage/abilities/keyword/IngestAbility.java
index b34795ad620..6a632a72881 100644
--- a/Mage/src/main/java/mage/abilities/keyword/IngestAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/IngestAbility.java
@@ -10,7 +10,6 @@ import mage.game.Game;
import mage.players.Player;
/**
- *
* @author LevelX2
*/
public class IngestAbility extends DealsCombatDamageToAPlayerTriggeredAbility {
@@ -42,7 +41,7 @@ class IngestEffect extends OneShotEffect {
this.staticText = "that player exiles the top card of their library";
}
- public IngestEffect(final IngestEffect effect) {
+ protected IngestEffect(final IngestEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/InspiredAbility.java b/Mage/src/main/java/mage/abilities/keyword/InspiredAbility.java
index 3b077e244ce..e7b3ae920fa 100644
--- a/Mage/src/main/java/mage/abilities/keyword/InspiredAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/InspiredAbility.java
@@ -30,7 +30,7 @@ public class InspiredAbility extends TriggeredAbilityImpl {
setTriggerPhrase("Whenever {this} becomes untapped, ");
}
- public InspiredAbility(final InspiredAbility ability) {
+ protected InspiredAbility(final InspiredAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/IntimidateAbility.java b/Mage/src/main/java/mage/abilities/keyword/IntimidateAbility.java
index b41f53acae3..c04dbb7be6b 100644
--- a/Mage/src/main/java/mage/abilities/keyword/IntimidateAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/IntimidateAbility.java
@@ -48,7 +48,7 @@ class IntimidateEffect extends RestrictionEffect implements MageSingleton {
super(Duration.EndOfGame);
}
- public IntimidateEffect(final IntimidateEffect effect) {
+ protected IntimidateEffect(final IntimidateEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/IslandcyclingAbility.java b/Mage/src/main/java/mage/abilities/keyword/IslandcyclingAbility.java
index b15bf92eb36..719057f498c 100644
--- a/Mage/src/main/java/mage/abilities/keyword/IslandcyclingAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/IslandcyclingAbility.java
@@ -7,21 +7,21 @@ import mage.constants.SubType;
import mage.filter.common.FilterLandCard;
/**
- *
* @author Plopman
*/
-public class IslandcyclingAbility extends CyclingAbility{
+public class IslandcyclingAbility extends CyclingAbility {
private static final FilterLandCard filter = new FilterLandCard("Island card");
private static final String text = "Islandcycling";
- static{
+
+ static {
filter.add(SubType.ISLAND.getPredicate());
}
-
+
public IslandcyclingAbility(ManaCosts costs) {
super(costs, filter, text);
}
- public IslandcyclingAbility(final IslandcyclingAbility ability) {
+ protected IslandcyclingAbility(final IslandcyclingAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/IslandwalkAbility.java b/Mage/src/main/java/mage/abilities/keyword/IslandwalkAbility.java
index 54a1f9f0907..73e7a8d32f3 100644
--- a/Mage/src/main/java/mage/abilities/keyword/IslandwalkAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/IslandwalkAbility.java
@@ -6,7 +6,6 @@ import mage.filter.common.FilterControlledLandPermanent;
import mage.filter.common.FilterLandPermanent;
/**
- *
* @author BetaSteward_at_googlemail.com
*/
public class IslandwalkAbility extends LandwalkAbility {
@@ -25,7 +24,7 @@ public class IslandwalkAbility extends LandwalkAbility {
super(filter, withHintText);
}
- public IslandwalkAbility(final IslandwalkAbility ability) {
+ protected IslandwalkAbility(final IslandwalkAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/JumpStartAbility.java b/Mage/src/main/java/mage/abilities/keyword/JumpStartAbility.java
index 5bccff1ddb1..3070a664325 100644
--- a/Mage/src/main/java/mage/abilities/keyword/JumpStartAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/JumpStartAbility.java
@@ -47,7 +47,7 @@ public class JumpStartAbility extends SpellAbility {
this.addCost(cost);
}
- public JumpStartAbility(final JumpStartAbility ability) {
+ protected JumpStartAbility(final JumpStartAbility ability) {
super(ability);
this.replacementEffectAdded = ability.replacementEffectAdded;
}
@@ -93,7 +93,7 @@ class JumpStartReplacementEffect extends ReplacementEffectImpl {
+ "any time it would leave the stack)";
}
- public JumpStartReplacementEffect(final JumpStartReplacementEffect effect) {
+ protected JumpStartReplacementEffect(final JumpStartReplacementEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/KickerAbility.java b/Mage/src/main/java/mage/abilities/keyword/KickerAbility.java
index b291f252681..bd17bba4be0 100644
--- a/Mage/src/main/java/mage/abilities/keyword/KickerAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/KickerAbility.java
@@ -79,7 +79,7 @@ public class KickerAbility extends StaticAbility implements OptionalAdditionalSo
setRuleAtTheTop(true);
}
- public KickerAbility(final KickerAbility ability) {
+ protected KickerAbility(final KickerAbility ability) {
super(ability);
for (OptionalAdditionalCost cost : ability.kickerCosts) {
this.kickerCosts.add(cost.copy());
diff --git a/Mage/src/main/java/mage/abilities/keyword/KickerWithAnyNumberModesAbility.java b/Mage/src/main/java/mage/abilities/keyword/KickerWithAnyNumberModesAbility.java
index c9c58fb208f..40473afd276 100644
--- a/Mage/src/main/java/mage/abilities/keyword/KickerWithAnyNumberModesAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/KickerWithAnyNumberModesAbility.java
@@ -20,7 +20,7 @@ public class KickerWithAnyNumberModesAbility extends KickerAbility implements Op
super(cost);
}
- public KickerWithAnyNumberModesAbility(final KickerWithAnyNumberModesAbility ability) {
+ protected KickerWithAnyNumberModesAbility(final KickerWithAnyNumberModesAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/LevelUpAbility.java b/Mage/src/main/java/mage/abilities/keyword/LevelUpAbility.java
index 97c6ce63a49..40dc745e9ed 100644
--- a/Mage/src/main/java/mage/abilities/keyword/LevelUpAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/LevelUpAbility.java
@@ -10,7 +10,6 @@ import mage.constants.Zone;
import mage.counters.CounterType;
/**
- *
* @author BetaSteward_at_googlemail.com
*/
public class LevelUpAbility extends ActivatedAbilityImpl {
@@ -20,7 +19,7 @@ public class LevelUpAbility extends ActivatedAbilityImpl {
this.timing = TimingRule.SORCERY;
}
- public LevelUpAbility(final LevelUpAbility ability) {
+ protected LevelUpAbility(final LevelUpAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/LivingMetalAbility.java b/Mage/src/main/java/mage/abilities/keyword/LivingMetalAbility.java
index fda289b1bb5..b06e929655c 100644
--- a/Mage/src/main/java/mage/abilities/keyword/LivingMetalAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/LivingMetalAbility.java
@@ -20,7 +20,7 @@ public class LivingMetalAbility extends SimpleStaticAbility {
this.addHint(MyTurnHint.instance);
}
- public LivingMetalAbility(final LivingMetalAbility ability) {
+ protected LivingMetalAbility(final LivingMetalAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/LivingWeaponAbility.java b/Mage/src/main/java/mage/abilities/keyword/LivingWeaponAbility.java
index 27548f7f4be..0bda93f32d9 100644
--- a/Mage/src/main/java/mage/abilities/keyword/LivingWeaponAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/LivingWeaponAbility.java
@@ -10,7 +10,7 @@ public class LivingWeaponAbility extends EntersBattlefieldTriggeredAbility {
super(new CreateTokenAttachSourceEffect(new PhyrexianGermToken()));
}
- public LivingWeaponAbility(final LivingWeaponAbility ability) {
+ protected LivingWeaponAbility(final LivingWeaponAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/MeditateAbility.java b/Mage/src/main/java/mage/abilities/keyword/MeditateAbility.java
index 200ac2aef24..b37b085399f 100644
--- a/Mage/src/main/java/mage/abilities/keyword/MeditateAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/MeditateAbility.java
@@ -16,7 +16,6 @@ import mage.game.permanent.Permanent;
import mage.players.Player;
/**
- *
* @author Styxo
*/
public class MeditateAbility extends ActivatedAbilityImpl {
@@ -26,7 +25,7 @@ public class MeditateAbility extends ActivatedAbilityImpl {
this.timing = TimingRule.SORCERY;
}
- public MeditateAbility(final MeditateAbility ability) {
+ protected MeditateAbility(final MeditateAbility ability) {
super(ability);
}
@@ -50,7 +49,7 @@ class ReturnToHandEffect extends OneShotEffect {
super(Outcome.ReturnToHand);
}
- public ReturnToHandEffect(final ReturnToHandEffect effect) {
+ protected ReturnToHandEffect(final ReturnToHandEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/MeleeAbility.java b/Mage/src/main/java/mage/abilities/keyword/MeleeAbility.java
index 7d5a90265e7..c155b13f3e0 100644
--- a/Mage/src/main/java/mage/abilities/keyword/MeleeAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/MeleeAbility.java
@@ -23,7 +23,7 @@ public class MeleeAbility extends AttacksTriggeredAbility {
this.addWatcher(new MeleeWatcher());
}
- public MeleeAbility(final MeleeAbility ability) {
+ protected MeleeAbility(final MeleeAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/MenaceAbility.java b/Mage/src/main/java/mage/abilities/keyword/MenaceAbility.java
index b83cb1b1875..7acd3bd9be4 100644
--- a/Mage/src/main/java/mage/abilities/keyword/MenaceAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/MenaceAbility.java
@@ -20,7 +20,7 @@ public class MenaceAbility extends StaticAbility { // Menace may not be a Single
this.showAbilityHint = showAbilityHint;
}
- public MenaceAbility(final MenaceAbility ability) {
+ protected MenaceAbility(final MenaceAbility ability) {
super(ability);
this.showAbilityHint = ability.showAbilityHint;
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/MentorAbility.java b/Mage/src/main/java/mage/abilities/keyword/MentorAbility.java
index 6dd3e873096..27deaf53740 100644
--- a/Mage/src/main/java/mage/abilities/keyword/MentorAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/MentorAbility.java
@@ -29,7 +29,7 @@ public class MentorAbility extends AttacksTriggeredAbility {
this.addTarget(new TargetCreaturePermanent(filter));
}
- public MentorAbility(final MentorAbility ability) {
+ protected MentorAbility(final MentorAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/MiracleAbility.java b/Mage/src/main/java/mage/abilities/keyword/MiracleAbility.java
index 701f82ffe74..2857294f917 100644
--- a/Mage/src/main/java/mage/abilities/keyword/MiracleAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/MiracleAbility.java
@@ -123,7 +123,7 @@ class MiracleEffect extends OneShotEffect {
this.miracleCosts = new ManaCostsImpl<>(miracleCosts);
}
- public MiracleEffect(final MiracleEffect effect) {
+ protected MiracleEffect(final MiracleEffect effect) {
super(effect);
this.miracleCosts = effect.miracleCosts;
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/MonstrosityAbility.java b/Mage/src/main/java/mage/abilities/keyword/MonstrosityAbility.java
index c15d6be253b..b0eb18499aa 100644
--- a/Mage/src/main/java/mage/abilities/keyword/MonstrosityAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/MonstrosityAbility.java
@@ -55,7 +55,7 @@ public class MonstrosityAbility extends ActivatedAbilityImpl {
this.addHint(MonstrousHint.instance);
}
- public MonstrosityAbility(final MonstrosityAbility ability) {
+ protected MonstrosityAbility(final MonstrosityAbility ability) {
super(ability);
this.monstrosityValue = ability.monstrosityValue;
}
@@ -78,7 +78,7 @@ class BecomeMonstrousSourceEffect extends OneShotEffect {
this.staticText = setText(monstrosityValue);
}
- public BecomeMonstrousSourceEffect(final BecomeMonstrousSourceEffect effect) {
+ protected BecomeMonstrousSourceEffect(final BecomeMonstrousSourceEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java b/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java
index a2062059e36..c0a0084c2a5 100644
--- a/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java
@@ -92,7 +92,7 @@ public class MorphAbility extends AlternativeSourceCostsImpl {
addSubAbility(ability);
}
- public MorphAbility(final MorphAbility ability) {
+ protected MorphAbility(final MorphAbility ability) {
super(ability);
this.morphCosts = ability.morphCosts; // can't be changed
this.megamorph = ability.megamorph;
diff --git a/Mage/src/main/java/mage/abilities/keyword/MountaincyclingAbility.java b/Mage/src/main/java/mage/abilities/keyword/MountaincyclingAbility.java
index 54b87343464..a5e8dae3767 100644
--- a/Mage/src/main/java/mage/abilities/keyword/MountaincyclingAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/MountaincyclingAbility.java
@@ -7,13 +7,13 @@ import mage.constants.SubType;
import mage.filter.common.FilterLandCard;
/**
- *
* @author Plopman
*/
-public class MountaincyclingAbility extends CyclingAbility{
+public class MountaincyclingAbility extends CyclingAbility {
private static final FilterLandCard filter = new FilterLandCard("Mountain card");
private static final String text = "Mountaincycling";
- static{
+
+ static {
filter.add(SubType.MOUNTAIN.getPredicate());
}
@@ -21,7 +21,7 @@ public class MountaincyclingAbility extends CyclingAbility{
super(costs, filter, text);
}
- public MountaincyclingAbility(final MountaincyclingAbility ability) {
+ protected MountaincyclingAbility(final MountaincyclingAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/MountainwalkAbility.java b/Mage/src/main/java/mage/abilities/keyword/MountainwalkAbility.java
index 1c788031874..ce99faa9d1e 100644
--- a/Mage/src/main/java/mage/abilities/keyword/MountainwalkAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/MountainwalkAbility.java
@@ -6,7 +6,6 @@ import mage.filter.common.FilterControlledLandPermanent;
import mage.filter.common.FilterLandPermanent;
/**
- *
* @author BetaSteward_at_googlemail.com
*/
public class MountainwalkAbility extends LandwalkAbility {
@@ -25,7 +24,7 @@ public class MountainwalkAbility extends LandwalkAbility {
super(filter, withHintText);
}
- public MountainwalkAbility(final MountainwalkAbility ability) {
+ protected MountainwalkAbility(final MountainwalkAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/MultikickerAbility.java b/Mage/src/main/java/mage/abilities/keyword/MultikickerAbility.java
index 0406264f2c8..8ab2ee0e90f 100644
--- a/Mage/src/main/java/mage/abilities/keyword/MultikickerAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/MultikickerAbility.java
@@ -7,10 +7,9 @@ import mage.abilities.costs.Cost;
import mage.abilities.costs.OptionalAdditionalCost;
/**
- *
* 20121001 702.31c Multikicker is a variant of the kicker ability. "Multikicker [cost]" means
- * "You may pay an additional [cost] any number of times as you cast this spell."
- * A multikicker cost is a kicker cost.
+ * "You may pay an additional [cost] any number of times as you cast this spell."
+ * A multikicker cost is a kicker cost.
*
* @author LevelX2
*/
@@ -21,23 +20,23 @@ public class MultikickerAbility extends KickerAbility {
protected static final String MultikickerReminder = "You may pay an additional {cost} any number of times as you cast this spell.";
public MultikickerAbility(String manaString) {
- super(MultikickerKeyword, MultikickerReminder);
- OptionalAdditionalCost multikickerCost = this.addKickerCost(manaString);
- multikickerCost.setRepeatable(true);
+ super(MultikickerKeyword, MultikickerReminder);
+ OptionalAdditionalCost multikickerCost = this.addKickerCost(manaString);
+ multikickerCost.setRepeatable(true);
}
public MultikickerAbility(Cost cost) {
- super(MultikickerKeyword, MultikickerReminder);
- OptionalAdditionalCost multikickerCost =this.addKickerCost(cost);
- multikickerCost.setRepeatable(true);
+ super(MultikickerKeyword, MultikickerReminder);
+ OptionalAdditionalCost multikickerCost = this.addKickerCost(cost);
+ multikickerCost.setRepeatable(true);
}
- public MultikickerAbility(final MultikickerAbility ability) {
- super(ability);
+ protected MultikickerAbility(final MultikickerAbility ability) {
+ super(ability);
}
@Override
public MultikickerAbility copy() {
- return new MultikickerAbility(this);
+ return new MultikickerAbility(this);
}
}
\ No newline at end of file
diff --git a/Mage/src/main/java/mage/abilities/keyword/MyriadAbility.java b/Mage/src/main/java/mage/abilities/keyword/MyriadAbility.java
index 10fdd3bab2e..fbe8d588f73 100644
--- a/Mage/src/main/java/mage/abilities/keyword/MyriadAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/MyriadAbility.java
@@ -4,6 +4,7 @@ package mage.abilities.keyword;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
+
import mage.abilities.Ability;
import mage.abilities.common.AttacksTriggeredAbility;
import mage.abilities.common.delayed.AtTheEndOfCombatDelayedTriggeredAbility;
@@ -24,13 +25,13 @@ public class MyriadAbility extends AttacksTriggeredAbility {
public MyriadAbility() {
super(new MyriadEffect(), false,
"myriad (Whenever this creature attacks, for each opponent other than the defending player, "
- + "put a token that's a copy of this creature onto the battlefield tapped and attacking "
- + "that player or a planeswalker they control. Exile those tokens at the end of combat.)",
+ + "put a token that's a copy of this creature onto the battlefield tapped and attacking "
+ + "that player or a planeswalker they control. Exile those tokens at the end of combat.)",
SetTargetPointer.PLAYER
);
}
- public MyriadAbility(final MyriadAbility ability) {
+ protected MyriadAbility(final MyriadAbility ability) {
super(ability);
}
@@ -51,7 +52,7 @@ class MyriadEffect extends OneShotEffect {
+ "Exile the tokens at the end of combat";
}
- public MyriadEffect(final MyriadEffect effect) {
+ protected MyriadEffect(final MyriadEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/NinjutsuAbility.java b/Mage/src/main/java/mage/abilities/keyword/NinjutsuAbility.java
index 2e6fccd1cfe..01985c72626 100644
--- a/Mage/src/main/java/mage/abilities/keyword/NinjutsuAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/NinjutsuAbility.java
@@ -90,7 +90,7 @@ class NinjutsuEffect extends OneShotEffect {
+ "from your hand tapped and attacking";
}
- public NinjutsuEffect(final NinjutsuEffect effect) {
+ protected NinjutsuEffect(final NinjutsuEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/OfferingAbility.java b/Mage/src/main/java/mage/abilities/keyword/OfferingAbility.java
index 99313032c7a..055a616fd27 100644
--- a/Mage/src/main/java/mage/abilities/keyword/OfferingAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/OfferingAbility.java
@@ -124,7 +124,7 @@ class OfferingAsThoughEffect extends AsThoughEffectImpl {
super(AsThoughEffectType.CAST_AS_INSTANT, Duration.EndOfGame, Outcome.Benefit);
}
- public OfferingAsThoughEffect(final OfferingAsThoughEffect effect) {
+ protected OfferingAsThoughEffect(final OfferingAsThoughEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/OutlastAbility.java b/Mage/src/main/java/mage/abilities/keyword/OutlastAbility.java
index 578bcc99e90..f0b869d7cbd 100644
--- a/Mage/src/main/java/mage/abilities/keyword/OutlastAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/OutlastAbility.java
@@ -11,7 +11,6 @@ import mage.constants.Zone;
import mage.counters.CounterType;
/**
- *
* @author LevelX2
*/
public class OutlastAbility extends ActivatedAbilityImpl {
@@ -22,7 +21,7 @@ public class OutlastAbility extends ActivatedAbilityImpl {
this.timing = TimingRule.SORCERY;
}
- public OutlastAbility(final OutlastAbility ability) {
+ protected OutlastAbility(final OutlastAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/OverloadAbility.java b/Mage/src/main/java/mage/abilities/keyword/OverloadAbility.java
index f2a3c03a2b6..c7300abd721 100644
--- a/Mage/src/main/java/mage/abilities/keyword/OverloadAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/OverloadAbility.java
@@ -37,7 +37,7 @@ public class OverloadAbility extends SpellAbility {
this.timing = (card.isSorcery(null) ? TimingRule.SORCERY : TimingRule.INSTANT);
}
- public OverloadAbility(final OverloadAbility ability) {
+ protected OverloadAbility(final OverloadAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/PartnerWithAbility.java b/Mage/src/main/java/mage/abilities/keyword/PartnerWithAbility.java
index 0b12edfc851..bf3b60d4e98 100644
--- a/Mage/src/main/java/mage/abilities/keyword/PartnerWithAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/PartnerWithAbility.java
@@ -44,7 +44,7 @@ public class PartnerWithAbility extends EntersBattlefieldTriggeredAbility {
}
}
- public PartnerWithAbility(final PartnerWithAbility ability) {
+ protected PartnerWithAbility(final PartnerWithAbility ability) {
super(ability);
this.partnerName = ability.partnerName;
this.shortName = ability.shortName;
@@ -98,7 +98,7 @@ class PartnersWithSearchEffect extends OneShotEffect {
this.staticText = "";
}
- public PartnersWithSearchEffect(final PartnersWithSearchEffect effect) {
+ protected PartnersWithSearchEffect(final PartnersWithSearchEffect effect) {
super(effect);
this.partnerName = effect.partnerName;
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/PersistAbility.java b/Mage/src/main/java/mage/abilities/keyword/PersistAbility.java
index 3f0aabeaf5a..744e0f0166d 100644
--- a/Mage/src/main/java/mage/abilities/keyword/PersistAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/PersistAbility.java
@@ -20,7 +20,7 @@ public class PersistAbility extends DiesSourceTriggeredAbility {
this.addEffect(new ReturnSourceFromGraveyardToBattlefieldEffect(false, true));
}
- public PersistAbility(final PersistAbility ability) {
+ protected PersistAbility(final PersistAbility ability) {
super(ability);
}
@@ -58,7 +58,7 @@ class PersistEffect extends OneShotEffect {
this.staticText = "";
}
- public PersistEffect(final PersistEffect effect) {
+ protected PersistEffect(final PersistEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/PlainscyclingAbility.java b/Mage/src/main/java/mage/abilities/keyword/PlainscyclingAbility.java
index 65aefa36ef8..1d38dbbc244 100644
--- a/Mage/src/main/java/mage/abilities/keyword/PlainscyclingAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/PlainscyclingAbility.java
@@ -7,13 +7,13 @@ import mage.constants.SubType;
import mage.filter.common.FilterLandCard;
/**
- *
* @author Loki
*/
-public class PlainscyclingAbility extends CyclingAbility{
+public class PlainscyclingAbility extends CyclingAbility {
private static final FilterLandCard filter = new FilterLandCard("Plains card");
private static final String text = "Plainscycling";
- static{
+
+ static {
filter.add(SubType.PLAINS.getPredicate());
}
@@ -21,7 +21,7 @@ public class PlainscyclingAbility extends CyclingAbility{
super(costs, filter, text);
}
- public PlainscyclingAbility(final PlainscyclingAbility ability) {
+ protected PlainscyclingAbility(final PlainscyclingAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/PlainswalkAbility.java b/Mage/src/main/java/mage/abilities/keyword/PlainswalkAbility.java
index bf017f5b6c0..e987819795c 100644
--- a/Mage/src/main/java/mage/abilities/keyword/PlainswalkAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/PlainswalkAbility.java
@@ -6,7 +6,6 @@ import mage.filter.common.FilterControlledLandPermanent;
import mage.filter.common.FilterLandPermanent;
/**
- *
* @author BetaSteward_at_googlemail.com
*/
public class PlainswalkAbility extends LandwalkAbility {
@@ -25,7 +24,7 @@ public class PlainswalkAbility extends LandwalkAbility {
super(filter, withHintText);
}
- public PlainswalkAbility(final PlainswalkAbility ability) {
+ protected PlainswalkAbility(final PlainswalkAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/ProtectionAbility.java b/Mage/src/main/java/mage/abilities/keyword/ProtectionAbility.java
index 856c2fa9bcc..f47c2801a7d 100644
--- a/Mage/src/main/java/mage/abilities/keyword/ProtectionAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/ProtectionAbility.java
@@ -39,7 +39,7 @@ public class ProtectionAbility extends StaticAbility {
this.auraIdNotToBeRemoved = null;
}
- public ProtectionAbility(final ProtectionAbility ability) {
+ protected ProtectionAbility(final ProtectionAbility ability) {
super(ability);
this.filter = ability.filter.copy();
this.removeAuras = ability.removeAuras;
diff --git a/Mage/src/main/java/mage/abilities/keyword/ProvokeAbility.java b/Mage/src/main/java/mage/abilities/keyword/ProvokeAbility.java
index 31b4f9ff56f..1285e549d80 100644
--- a/Mage/src/main/java/mage/abilities/keyword/ProvokeAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/ProvokeAbility.java
@@ -2,6 +2,7 @@
package mage.abilities.keyword;
import java.util.UUID;
+
import mage.abilities.Ability;
import mage.abilities.common.AttacksTriggeredAbility;
import mage.abilities.effects.RequirementEffect;
@@ -22,7 +23,6 @@ import mage.target.common.TargetCreaturePermanent;
* provoke, each triggers separately.
*
* @author LevelX2
- *
*/
public class ProvokeAbility extends AttacksTriggeredAbility {
@@ -35,7 +35,7 @@ public class ProvokeAbility extends AttacksTriggeredAbility {
this.addEffect(new ProvokeRequirementEffect());
}
- public ProvokeAbility(final ProvokeAbility ability) {
+ protected ProvokeAbility(final ProvokeAbility ability) {
super(ability);
}
@@ -71,7 +71,7 @@ class ProvokeRequirementEffect extends RequirementEffect {
staticText = "and blocks {this} this turn if able";
}
- public ProvokeRequirementEffect(final ProvokeRequirementEffect effect) {
+ protected ProvokeRequirementEffect(final ProvokeRequirementEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/ProwessAbility.java b/Mage/src/main/java/mage/abilities/keyword/ProwessAbility.java
index 3ffe9953df2..ba647e6f2d6 100644
--- a/Mage/src/main/java/mage/abilities/keyword/ProwessAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/ProwessAbility.java
@@ -14,7 +14,7 @@ public class ProwessAbility extends SpellCastControllerTriggeredAbility {
super(new BoostSourceEffect(1, 1, Duration.EndOfTurn), StaticFilters.FILTER_SPELL_NON_CREATURE, false);
}
- public ProwessAbility(final ProwessAbility ability) {
+ protected ProwessAbility(final ProwessAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/RampageAbility.java b/Mage/src/main/java/mage/abilities/keyword/RampageAbility.java
index dea804dde2d..65280856aa3 100644
--- a/Mage/src/main/java/mage/abilities/keyword/RampageAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/RampageAbility.java
@@ -9,7 +9,6 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect;
import mage.constants.Duration;
/**
- *
* @author LoneFox
*/
public class RampageAbility extends BecomesBlockedSourceTriggeredAbility {
@@ -24,13 +23,13 @@ public class RampageAbility extends BecomesBlockedSourceTriggeredAbility {
super(null, false);
rule = "rampage " + amount
+ (shortRuleText ? ""
- : " (Whenever this creature becomes blocked, it gets +"
- + amount + "/+" + amount + " until end of turn for each creature blocking it beyond the first.)");
+ : " (Whenever this creature becomes blocked, it gets +"
+ + amount + "/+" + amount + " until end of turn for each creature blocking it beyond the first.)");
DynamicValue rv = (amount == 1 ? BlockingCreatureCount.BEYOND_FIRST : new MultipliedValue(BlockingCreatureCount.BEYOND_FIRST, amount));
this.addEffect(new BoostSourceEffect(rv, rv, Duration.EndOfTurn, true));
}
- public RampageAbility(final RampageAbility ability) {
+ protected RampageAbility(final RampageAbility ability) {
super(ability);
this.rule = ability.rule;
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/ReboundAbility.java b/Mage/src/main/java/mage/abilities/keyword/ReboundAbility.java
index 5898f19bba8..3ea68097574 100644
--- a/Mage/src/main/java/mage/abilities/keyword/ReboundAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/ReboundAbility.java
@@ -48,7 +48,7 @@ public class ReboundAbility extends SimpleStaticAbility {
super(Zone.STACK, new ReboundCastFromHandReplacementEffect());
}
- public ReboundAbility(final ReboundAbility ability) {
+ protected ReboundAbility(final ReboundAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/RecoverAbility.java b/Mage/src/main/java/mage/abilities/keyword/RecoverAbility.java
index cf6bb384bb7..3bcd02f36db 100644
--- a/Mage/src/main/java/mage/abilities/keyword/RecoverAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/RecoverAbility.java
@@ -31,7 +31,7 @@ public class RecoverAbility extends TriggeredAbilityImpl {
super(Zone.GRAVEYARD, new RecoverEffect(cost, card.isCreature()), false);
}
- public RecoverAbility(final RecoverAbility ability) {
+ protected RecoverAbility(final RecoverAbility ability) {
super(ability);
}
@@ -74,7 +74,7 @@ class RecoverEffect extends OneShotEffect {
this.staticText = setText(cost, creature);
}
- public RecoverEffect(final RecoverEffect effect) {
+ protected RecoverEffect(final RecoverEffect effect) {
super(effect);
this.cost = effect.cost.copy();
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/ReinforceAbility.java b/Mage/src/main/java/mage/abilities/keyword/ReinforceAbility.java
index 89b2d51a7bc..91094bc762a 100644
--- a/Mage/src/main/java/mage/abilities/keyword/ReinforceAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/ReinforceAbility.java
@@ -29,7 +29,7 @@ public class ReinforceAbility extends SimpleActivatedAbility {
}
- public ReinforceAbility(final ReinforceAbility ability) {
+ protected ReinforceAbility(final ReinforceAbility ability) {
super(ability);
this.cost = ability.cost.copy();
this.count = ability.count;
diff --git a/Mage/src/main/java/mage/abilities/keyword/RepairAbility.java b/Mage/src/main/java/mage/abilities/keyword/RepairAbility.java
index 760ba5fefaf..e073fe52e89 100644
--- a/Mage/src/main/java/mage/abilities/keyword/RepairAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/RepairAbility.java
@@ -23,7 +23,6 @@ import mage.players.Player;
import mage.target.targetpointer.FixedTarget;
/**
- *
* @author Styxo, Merlingilb
*/
public class RepairAbility extends DiesSourceTriggeredAbility {
@@ -42,7 +41,7 @@ public class RepairAbility extends DiesSourceTriggeredAbility {
}
- public RepairAbility(final RepairAbility ability) {
+ protected RepairAbility(final RepairAbility ability) {
super(ability);
this.ruleText = ability.ruleText;
}
@@ -130,13 +129,13 @@ class RepairBeginningOfUpkeepInterveningIfTriggeredAbility extends ConditionalIn
public RepairBeginningOfUpkeepInterveningIfTriggeredAbility() {
super(new BeginningOfUpkeepTriggeredAbility(Zone.GRAVEYARD,
- new RemoveCounterSourceEffect(CounterType.REPAIR.createInstance()),TargetController.YOU, false),
+ new RemoveCounterSourceEffect(CounterType.REPAIR.createInstance()), TargetController.YOU, false),
new SourceHasCounterCondition(CounterType.REPAIR),
"At the beginning of your upkeep, remove a repair counter from {this}");
this.setRuleVisible(false);
}
- public RepairBeginningOfUpkeepInterveningIfTriggeredAbility(final RepairBeginningOfUpkeepInterveningIfTriggeredAbility effect) {
+ protected RepairBeginningOfUpkeepInterveningIfTriggeredAbility(final RepairBeginningOfUpkeepInterveningIfTriggeredAbility effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/ReplicateAbility.java b/Mage/src/main/java/mage/abilities/keyword/ReplicateAbility.java
index 9df741cb067..7d22d9c2a72 100644
--- a/Mage/src/main/java/mage/abilities/keyword/ReplicateAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/ReplicateAbility.java
@@ -42,7 +42,7 @@ public class ReplicateAbility extends StaticAbility implements OptionalAdditiona
addSubAbility(new ReplicateTriggeredAbility());
}
- public ReplicateAbility(final ReplicateAbility ability) {
+ protected ReplicateAbility(final ReplicateAbility ability) {
super(ability);
additionalCost = ability.additionalCost;
}
@@ -189,7 +189,7 @@ class ReplicateCopyEffect extends OneShotEffect {
super(Outcome.Copy);
}
- public ReplicateCopyEffect(final ReplicateCopyEffect effect) {
+ protected ReplicateCopyEffect(final ReplicateCopyEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/RetraceAbility.java b/Mage/src/main/java/mage/abilities/keyword/RetraceAbility.java
index c48fb815e52..b98288ecde1 100644
--- a/Mage/src/main/java/mage/abilities/keyword/RetraceAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/RetraceAbility.java
@@ -28,7 +28,7 @@ public class RetraceAbility extends SpellAbility {
this.setRuleAtTheTop(true);
}
- public RetraceAbility(final RetraceAbility ability) {
+ protected RetraceAbility(final RetraceAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/RippleAbility.java b/Mage/src/main/java/mage/abilities/keyword/RippleAbility.java
index a06ff838bdc..c47f59dbfa0 100644
--- a/Mage/src/main/java/mage/abilities/keyword/RippleAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/RippleAbility.java
@@ -70,7 +70,7 @@ class RippleEffect extends OneShotEffect {
this.rippleNumber = rippleNumber;
}
- public RippleEffect(final RippleEffect effect) {
+ protected RippleEffect(final RippleEffect effect) {
super(effect);
this.rippleNumber = effect.rippleNumber;
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/ScavengeAbility.java b/Mage/src/main/java/mage/abilities/keyword/ScavengeAbility.java
index a83256e7743..ab14a36558a 100644
--- a/Mage/src/main/java/mage/abilities/keyword/ScavengeAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/ScavengeAbility.java
@@ -18,7 +18,6 @@ import mage.game.Game;
import mage.target.common.TargetCreaturePermanent;
/**
- *
* @author magenoxx_at_gmail.com
*/
@@ -42,7 +41,7 @@ public class ScavengeAbility extends ActivatedAbilityImpl {
this.addTarget(new TargetCreaturePermanent());
}
- public ScavengeAbility(final ScavengeAbility ability) {
+ protected ScavengeAbility(final ScavengeAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/ShadowAbility.java b/Mage/src/main/java/mage/abilities/keyword/ShadowAbility.java
index 2aa9a801606..fd95692f59e 100644
--- a/Mage/src/main/java/mage/abilities/keyword/ShadowAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/ShadowAbility.java
@@ -50,7 +50,7 @@ class ShadowEffect extends RestrictionEffect implements MageSingleton {
super(Duration.EndOfGame);
}
- public ShadowEffect(final ShadowEffect effect) {
+ protected ShadowEffect(final ShadowEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/SkulkAbility.java b/Mage/src/main/java/mage/abilities/keyword/SkulkAbility.java
index 44e087cc245..136dbdb7bd0 100644
--- a/Mage/src/main/java/mage/abilities/keyword/SkulkAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/SkulkAbility.java
@@ -17,7 +17,7 @@ public class SkulkAbility extends StaticAbility {
super(Zone.BATTLEFIELD, new SkulkEffect(Duration.WhileOnBattlefield));
}
- public SkulkAbility(final SkulkAbility ability) {
+ protected SkulkAbility(final SkulkAbility ability) {
super(ability);
}
@@ -40,7 +40,7 @@ class SkulkEffect extends RestrictionEffect {
staticText = "Skulk (This creature can't be blocked by creatures with greater power.)";
}
- public SkulkEffect(final SkulkEffect effect) {
+ protected SkulkEffect(final SkulkEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/SoulbondAbility.java b/Mage/src/main/java/mage/abilities/keyword/SoulbondAbility.java
index e606fbffcb9..c9d2faa52b4 100644
--- a/Mage/src/main/java/mage/abilities/keyword/SoulbondAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/SoulbondAbility.java
@@ -23,7 +23,7 @@ import mage.util.GameLog;
/**
* 702.94. Soulbond
- *
+ *
* 702.94a Soulbond is a keyword that represents two triggered abilities.
* “Soulbond” means “When this creature enters the battlefield, if you control
* both this creature and another creature and both are unpaired, you may pair
@@ -33,19 +33,19 @@ import mage.util.GameLog;
* creature and this one and both are unpaired, you may pair that creature with
* this creature for as long as both remain creatures on the battlefield under
* your control.”
- *
+ *
* 702.94b A creature becomes “paired” with another as the result of a soulbond
* ability. Abilities may refer to a paired creature, the creature another
* creature is paired with, or whether a creature is paired. An “unpaired”
* creature is one that is not paired.
- *
+ *
* 702.94c When the soulbond ability resolves, if either object that would be
* paired is no longer a creature, no longer on the battlefield, or no longer
* under the control of the player who controls the soulbond ability, neither
* object becomes paired.
- *
+ *
* 702.94d A creature can be paired with only one other creature.
- *
+ *
* 702.94e A paired creature becomes unpaired if any of the following occur:
* another player gains control of it or the creature it's paired with; it or
* the creature it's paired with stops being a creature; or it or the creature
@@ -119,7 +119,7 @@ class SoulboundEntersSelfEffect extends OneShotEffect {
super(Outcome.Benefit);
}
- public SoulboundEntersSelfEffect(final SoulboundEntersSelfEffect effect) {
+ protected SoulboundEntersSelfEffect(final SoulboundEntersSelfEffect effect) {
super(effect);
}
@@ -163,7 +163,6 @@ class SoulboundEntersSelfEffect extends OneShotEffect {
* control both that creature and this one and both are unpaired, you may pair
* that creature with this creature for as long as both remain creatures on the
* battlefield under your control.”
- *
*/
class SoulbondEntersOtherAbility extends EntersBattlefieldAllTriggeredAbility {
@@ -221,7 +220,7 @@ class SoulboundEntersOtherEffect extends OneShotEffect {
super(Outcome.Benefit);
}
- public SoulboundEntersOtherEffect(final SoulboundEntersOtherEffect effect) {
+ protected SoulboundEntersOtherEffect(final SoulboundEntersOtherEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/SoulshiftAbility.java b/Mage/src/main/java/mage/abilities/keyword/SoulshiftAbility.java
index 5d3e24cde6f..361f1dc3c64 100644
--- a/Mage/src/main/java/mage/abilities/keyword/SoulshiftAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/SoulshiftAbility.java
@@ -17,19 +17,18 @@ import mage.target.common.TargetCardInYourGraveyard;
import java.util.UUID;
/**
- *
- * 702.45. Soulshift
- * 702.45a Soulshift is a triggered ability. “Soulshift N” means “When this permanent is put into a graveyard from play,
- * you may return target Spirit card with converted mana cost N or less from your graveyard to your hand.”
- * 702.45b If a permanent has multiple instances of soulshift, each triggers separately.
- *
- * The soulshift number tells you the maximum converted mana cost of the Spirit card you can target.
- * You choose whether or not to return the targeted creature card when the ability resolves.
+ * 702.45. Soulshift
+ * 702.45a Soulshift is a triggered ability. “Soulshift N” means “When this permanent is put into a graveyard from play,
+ * you may return target Spirit card with converted mana cost N or less from your graveyard to your hand.”
+ * 702.45b If a permanent has multiple instances of soulshift, each triggers separately.
+ *
+ * The soulshift number tells you the maximum converted mana cost of the Spirit card you can target.
+ * You choose whether or not to return the targeted creature card when the ability resolves.
*
* @author Loki, LevelX2
*/
public class SoulshiftAbility extends DiesSourceTriggeredAbility {
-
+
private final DynamicValue amount;
public SoulshiftAbility(int amount) {
@@ -38,10 +37,10 @@ public class SoulshiftAbility extends DiesSourceTriggeredAbility {
public SoulshiftAbility(DynamicValue amount) {
super(new ReturnToHandTargetEffect());
- this.amount = amount;
+ this.amount = amount;
}
- public SoulshiftAbility(final SoulshiftAbility ability) {
+ protected SoulshiftAbility(final SoulshiftAbility ability) {
super(ability);
this.amount = ability.amount;
}
@@ -51,7 +50,7 @@ public class SoulshiftAbility extends DiesSourceTriggeredAbility {
this.getTargets().clear();
int intValue = amount.calculate(game, this, null);
FilterCard filter = new FilterCard("Spirit card with mana value " + intValue + " or less from your graveyard");
- filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, intValue + 1));
+ filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, intValue + 1));
filter.add(SubType.SPIRIT.getPredicate());
this.addTarget(new TargetCardInYourGraveyard(filter));
super.trigger(game, controllerId, triggeringEvent); //To change body of generated methods, choose Tools | Templates.
@@ -68,8 +67,8 @@ public class SoulshiftAbility extends DiesSourceTriggeredAbility {
return "Soulshift " + amount.toString() + " (When this creature dies, you may return target Spirit card with mana value " + amount.toString() + " or less from your graveyard to your hand.)";
} else {
return "{this} has soulshift X, where X is the number of " + amount.getMessage() +
- ". (When this creature dies, you may return target Spirit card with mana value X or less from your graveyard to your hand.)";
+ ". (When this creature dies, you may return target Spirit card with mana value X or less from your graveyard to your hand.)";
}
-
+
}
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/SpaceflightAbility.java b/Mage/src/main/java/mage/abilities/keyword/SpaceflightAbility.java
index 19ae36997fe..68bdd1a02ac 100644
--- a/Mage/src/main/java/mage/abilities/keyword/SpaceflightAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/SpaceflightAbility.java
@@ -47,7 +47,7 @@ class SpaceFlightEffect extends RestrictionEffect implements MageSingleton {
super(Duration.EndOfGame);
}
- public SpaceFlightEffect(final SpaceFlightEffect effect) {
+ protected SpaceFlightEffect(final SpaceFlightEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/SpectacleAbility.java b/Mage/src/main/java/mage/abilities/keyword/SpectacleAbility.java
index e86f7495098..6845e1ce41a 100644
--- a/Mage/src/main/java/mage/abilities/keyword/SpectacleAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/SpectacleAbility.java
@@ -39,7 +39,7 @@ public class SpectacleAbility extends SpellAbility {
this.addHint(OpponentsLostLifeHint.instance);
}
- public SpectacleAbility(final SpectacleAbility ability) {
+ protected SpectacleAbility(final SpectacleAbility ability) {
super(ability);
this.rule = ability.rule;
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/StormAbility.java b/Mage/src/main/java/mage/abilities/keyword/StormAbility.java
index d7242feec43..95b2ac9113f 100644
--- a/Mage/src/main/java/mage/abilities/keyword/StormAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/StormAbility.java
@@ -64,7 +64,7 @@ class StormEffect extends OneShotEffect {
super(Outcome.Copy);
}
- public StormEffect(final StormEffect effect) {
+ protected StormEffect(final StormEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/SunburstAbility.java b/Mage/src/main/java/mage/abilities/keyword/SunburstAbility.java
index 9398296f579..4237f482429 100644
--- a/Mage/src/main/java/mage/abilities/keyword/SunburstAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/SunburstAbility.java
@@ -31,7 +31,7 @@ public class SunburstAbility extends EntersBattlefieldAbility {
isCreature = card.isCreature();
}
- public SunburstAbility(final SunburstAbility ability) {
+ protected SunburstAbility(final SunburstAbility ability) {
super(ability);
this.isCreature = ability.isCreature;
}
@@ -62,7 +62,7 @@ class SunburstEffect extends OneShotEffect {
staticText = "Sunburst";
}
- public SunburstEffect(final SunburstEffect effect) {
+ protected SunburstEffect(final SunburstEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/SupportAbility.java b/Mage/src/main/java/mage/abilities/keyword/SupportAbility.java
index aaef23be4fb..79b84114d31 100644
--- a/Mage/src/main/java/mage/abilities/keyword/SupportAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/SupportAbility.java
@@ -10,7 +10,7 @@ import mage.target.common.TargetCreaturePermanent;
/**
* 701.32. Support
- *
+ *
* 701.32a “Support N” on a permanent means “Put a +1/+1 counter on each of up
* to N other target creatures.” “Support N” on an instant or sorcery spell
* means “Put a +1/+1 counter on each of up to N target creatures.”
@@ -36,10 +36,12 @@ public class SupportAbility extends EntersBattlefieldTriggeredAbility {
}
- public SupportAbility(Card card, int amount){ this( card, amount, true); }
+ public SupportAbility(Card card, int amount) {
+ this(card, amount, true);
+ }
- public SupportAbility(final SupportAbility ability) {
+ protected SupportAbility(final SupportAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/SurgeAbility.java b/Mage/src/main/java/mage/abilities/keyword/SurgeAbility.java
index 0833adf2df4..cf88cb09b82 100644
--- a/Mage/src/main/java/mage/abilities/keyword/SurgeAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/SurgeAbility.java
@@ -38,7 +38,7 @@ public class SurgeAbility extends SpellAbility {
+ " (You may cast this spell for its surge cost if you or a teammate has cast another spell this turn.)";
}
- public SurgeAbility(final SurgeAbility ability) {
+ protected SurgeAbility(final SurgeAbility ability) {
super(ability);
this.rule = ability.rule;
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/SuspendAbility.java b/Mage/src/main/java/mage/abilities/keyword/SuspendAbility.java
index 324995ff246..2e8d1c89b08 100644
--- a/Mage/src/main/java/mage/abilities/keyword/SuspendAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/SuspendAbility.java
@@ -246,7 +246,7 @@ class SuspendExileEffect extends OneShotEffect {
this.suspend = suspend;
}
- public SuspendExileEffect(final SuspendExileEffect effect) {
+ protected SuspendExileEffect(final SuspendExileEffect effect) {
super(effect);
this.suspend = effect.suspend;
}
@@ -326,7 +326,7 @@ class SuspendPlayCardEffect extends OneShotEffect {
+ "If you can't, it remains removed from the game";
}
- public SuspendPlayCardEffect(final SuspendPlayCardEffect effect) {
+ protected SuspendPlayCardEffect(final SuspendPlayCardEffect effect) {
super(effect);
}
@@ -394,7 +394,7 @@ class GainHasteEffect extends ContinuousEffectImpl {
staticText = "If you play it this way and it's a creature, it gains haste until you lose control of it";
}
- public GainHasteEffect(final GainHasteEffect effect) {
+ protected GainHasteEffect(final GainHasteEffect effect) {
super(effect);
this.suspendController = effect.suspendController;
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/SwampcyclingAbility.java b/Mage/src/main/java/mage/abilities/keyword/SwampcyclingAbility.java
index 7d990895b8b..3b564f6648e 100644
--- a/Mage/src/main/java/mage/abilities/keyword/SwampcyclingAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/SwampcyclingAbility.java
@@ -7,21 +7,22 @@ import mage.constants.SubType;
import mage.filter.common.FilterLandCard;
/**
- *
* @author Plopman
*/
-public class SwampcyclingAbility extends CyclingAbility{
-
+public class SwampcyclingAbility extends CyclingAbility {
+
private static final FilterLandCard filter = new FilterLandCard("Swamp card");
private static final String text = "Swampcycling";
- static{
+
+ static {
filter.add(SubType.SWAMP.getPredicate());
}
+
public SwampcyclingAbility(ManaCosts costs) {
super(costs, filter, text);
}
- public SwampcyclingAbility(final SwampcyclingAbility ability) {
+ protected SwampcyclingAbility(final SwampcyclingAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/SwampwalkAbility.java b/Mage/src/main/java/mage/abilities/keyword/SwampwalkAbility.java
index 752fc661c38..5a89bebbbab 100644
--- a/Mage/src/main/java/mage/abilities/keyword/SwampwalkAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/SwampwalkAbility.java
@@ -6,7 +6,6 @@ import mage.filter.common.FilterControlledLandPermanent;
import mage.filter.common.FilterLandPermanent;
/**
- *
* @author BetaSteward_at_googlemail.com
*/
public class SwampwalkAbility extends LandwalkAbility {
@@ -25,7 +24,7 @@ public class SwampwalkAbility extends LandwalkAbility {
super(filter, withHintText);
}
- public SwampwalkAbility(final SwampwalkAbility ability) {
+ protected SwampwalkAbility(final SwampwalkAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/TransmuteAbility.java b/Mage/src/main/java/mage/abilities/keyword/TransmuteAbility.java
index 06641481676..fe8a1c01564 100644
--- a/Mage/src/main/java/mage/abilities/keyword/TransmuteAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/TransmuteAbility.java
@@ -19,16 +19,15 @@ import mage.players.Player;
import mage.target.common.TargetCardInLibrary;
/**
- *
* 702.52. Transmute
- *
+ *
* 702.52a Transmute is an activated ability that functions only while the card
* with transmute is in a player's hand. “Transmute [cost]” means “[Cost],
* Discard this card: Search your library for a card with the same converted
* mana cost as the discarded card, reveal that card, and put it into your hand.
* Then shuffle your library. Play this ability only any time you could play a
* sorcery.”
- *
+ *
* 702.52b Although the transmute ability is playable only if the card is in a
* player's hand, it continues to exist while the object is in play and in all
* other zones. Therefore objects with transmute will be affected by effects
@@ -44,7 +43,7 @@ public class TransmuteAbility extends SimpleActivatedAbility {
this.addCost(new DiscardSourceCost());
}
- public TransmuteAbility(final TransmuteAbility ability) {
+ protected TransmuteAbility(final TransmuteAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/TributeAbility.java b/Mage/src/main/java/mage/abilities/keyword/TributeAbility.java
index 980c93f3c85..06bb04d158d 100644
--- a/Mage/src/main/java/mage/abilities/keyword/TributeAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/TributeAbility.java
@@ -2,6 +2,7 @@
package mage.abilities.keyword;
import java.util.UUID;
+
import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldAbility;
import mage.abilities.effects.OneShotEffect;
@@ -15,7 +16,6 @@ import mage.target.common.TargetOpponent;
import mage.util.CardUtil;
/**
- *
* @author LevelX2
*/
public class TributeAbility extends EntersBattlefieldAbility {
@@ -27,7 +27,7 @@ public class TributeAbility extends EntersBattlefieldAbility {
this.tributeValue = tributeValue;
}
- public TributeAbility(final TributeAbility ability) {
+ protected TributeAbility(final TributeAbility ability) {
super(ability);
this.tributeValue = ability.tributeValue;
}
@@ -53,7 +53,7 @@ class TributeEffect extends OneShotEffect {
this.tributeValue = tributeValue;
}
- public TributeEffect(final TributeEffect effect) {
+ protected TributeEffect(final TributeEffect effect) {
super(effect);
this.tributeValue = effect.tributeValue;
}
@@ -88,7 +88,7 @@ class TributeEffect extends OneShotEffect {
game.informPlayers(opponent.getLogName() + " pays tribute to " + sourcePermanent.getLogName());
}
game.getState().setValue("tributeValue" + source.getSourceId(), "yes");
- return sourcePermanent.addCounters(CounterType.P1P1.createInstance(tributeValue),opponent.getId(),source,game);
+ return sourcePermanent.addCounters(CounterType.P1P1.createInstance(tributeValue), opponent.getId(), source, game);
} else {
if (!game.isSimulation()) {
game.informPlayers(opponent.getLogName() + " does not pay tribute to " + sourcePermanent.getLogName());
diff --git a/Mage/src/main/java/mage/abilities/keyword/UndauntedAbility.java b/Mage/src/main/java/mage/abilities/keyword/UndauntedAbility.java
index 72f76d60f0e..7f352f72ac2 100644
--- a/Mage/src/main/java/mage/abilities/keyword/UndauntedAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/UndauntedAbility.java
@@ -15,7 +15,7 @@ public class UndauntedAbility extends SimpleStaticAbility {
setRuleAtTheTop(true);
}
- public UndauntedAbility(final UndauntedAbility ability) {
+ protected UndauntedAbility(final UndauntedAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/UndyingAbility.java b/Mage/src/main/java/mage/abilities/keyword/UndyingAbility.java
index c78ff4c5fb9..e2ac302a316 100644
--- a/Mage/src/main/java/mage/abilities/keyword/UndyingAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/UndyingAbility.java
@@ -22,7 +22,7 @@ public class UndyingAbility extends DiesSourceTriggeredAbility {
this.addEffect(new ReturnSourceFromGraveyardToBattlefieldEffect(false, true));
}
- public UndyingAbility(final UndyingAbility ability) {
+ protected UndyingAbility(final UndyingAbility ability) {
super(ability);
}
@@ -55,7 +55,7 @@ class UndyingEffect extends OneShotEffect {
this.staticText = "";
}
- public UndyingEffect(final UndyingEffect effect) {
+ protected UndyingEffect(final UndyingEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/UnearthAbility.java b/Mage/src/main/java/mage/abilities/keyword/UnearthAbility.java
index 4edf5d71038..a924b3db748 100644
--- a/Mage/src/main/java/mage/abilities/keyword/UnearthAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/UnearthAbility.java
@@ -39,7 +39,7 @@ public class UnearthAbility extends ActivatedAbilityImpl {
this.addEffect(new UnearthLeavesBattlefieldEffect());
}
- public UnearthAbility(final UnearthAbility ability) {
+ protected UnearthAbility(final UnearthAbility ability) {
super(ability);
}
@@ -64,7 +64,7 @@ class UnearthDelayedTriggeredAbility extends DelayedTriggeredAbility {
super(new ExileSourceEffect());
}
- public UnearthDelayedTriggeredAbility(final UnearthDelayedTriggeredAbility ability) {
+ protected UnearthDelayedTriggeredAbility(final UnearthDelayedTriggeredAbility ability) {
super(ability);
}
@@ -97,7 +97,7 @@ class UnearthLeavesBattlefieldEffect extends ReplacementEffectImpl {
staticText = "When {this} leaves the battlefield, exile it";
}
- public UnearthLeavesBattlefieldEffect(final UnearthLeavesBattlefieldEffect effect) {
+ protected UnearthLeavesBattlefieldEffect(final UnearthLeavesBattlefieldEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/UnleashAbility.java b/Mage/src/main/java/mage/abilities/keyword/UnleashAbility.java
index 7f2b922f29a..36d87c42ec9 100644
--- a/Mage/src/main/java/mage/abilities/keyword/UnleashAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/UnleashAbility.java
@@ -28,7 +28,7 @@ public class UnleashAbility extends SimpleStaticAbility {
this.addEffect(new UnleashRestrictionEffect());
}
- public UnleashAbility(final UnleashAbility ability) {
+ protected UnleashAbility(final UnleashAbility ability) {
super(ability);
}
@@ -101,7 +101,7 @@ class UnleashRestrictionEffect extends RestrictionEffect {
super(Duration.WhileOnBattlefield);
}
- public UnleashRestrictionEffect(final UnleashRestrictionEffect effect) {
+ protected UnleashRestrictionEffect(final UnleashRestrictionEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/VanishingSacrificeAbility.java b/Mage/src/main/java/mage/abilities/keyword/VanishingSacrificeAbility.java
index d6188978f70..8239a890cbd 100644
--- a/Mage/src/main/java/mage/abilities/keyword/VanishingSacrificeAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/VanishingSacrificeAbility.java
@@ -14,7 +14,7 @@ public class VanishingSacrificeAbility extends TriggeredAbilityImpl {
this.setRuleVisible(false);
}
- public VanishingSacrificeAbility(final VanishingSacrificeAbility ability) {
+ protected VanishingSacrificeAbility(final VanishingSacrificeAbility ability) {
super(ability);
}
@@ -38,5 +38,5 @@ public class VanishingSacrificeAbility extends TriggeredAbilityImpl {
public VanishingSacrificeAbility copy() {
return new VanishingSacrificeAbility(this);
}
-
+
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/VanishingUpkeepAbility.java b/Mage/src/main/java/mage/abilities/keyword/VanishingUpkeepAbility.java
index 2b5749cf554..e6097184fb3 100644
--- a/Mage/src/main/java/mage/abilities/keyword/VanishingUpkeepAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/VanishingUpkeepAbility.java
@@ -20,7 +20,7 @@ public class VanishingUpkeepAbility extends BeginningOfUpkeepTriggeredAbility {
this.vanishingAmount = vanishingEffect;
this.permanentType = "creature";
}
-
+
public VanishingUpkeepAbility(int vanishingEffect, String permanentType) {
super(new VanishingEffect(), TargetController.YOU, false);
this.vanishingAmount = vanishingEffect;
@@ -40,12 +40,11 @@ public class VanishingUpkeepAbility extends BeginningOfUpkeepTriggeredAbility {
@Override
public String getRule() {
- if(vanishingAmount > 0) {
+ if (vanishingAmount > 0) {
return "Vanishing " + vanishingAmount
- + " (This " + permanentType + " enters the battlefield with " + CardUtil.numberToText(vanishingAmount)
- + " time counters on it. At the beginning of your upkeep, remove a time counter from it. When the last is removed, sacrifice it.)";
- }
- else {
+ + " (This " + permanentType + " enters the battlefield with " + CardUtil.numberToText(vanishingAmount)
+ + " time counters on it. At the beginning of your upkeep, remove a time counter from it. When the last is removed, sacrifice it.)";
+ } else {
return "Vanishing (At the beginning of your upkeep, remove a time counter from this " + permanentType + ". When the last is removed, sacrifice it.)";
}
}
diff --git a/Mage/src/main/java/mage/abilities/mana/ActivateAsSorceryManaAbility.java b/Mage/src/main/java/mage/abilities/mana/ActivateAsSorceryManaAbility.java
index 7f8f3a361ec..e3e93c0bd0c 100644
--- a/Mage/src/main/java/mage/abilities/mana/ActivateAsSorceryManaAbility.java
+++ b/Mage/src/main/java/mage/abilities/mana/ActivateAsSorceryManaAbility.java
@@ -7,7 +7,6 @@ import mage.constants.TimingRule;
import mage.constants.Zone;
/**
- *
* @author LevelX2
*/
@@ -19,7 +18,7 @@ public class ActivateAsSorceryManaAbility extends SimpleManaAbility {
timing = TimingRule.SORCERY;
}
- public ActivateAsSorceryManaAbility(final ActivateAsSorceryManaAbility ability) {
+ protected ActivateAsSorceryManaAbility(final ActivateAsSorceryManaAbility ability) {
super(ability);
}
@@ -27,7 +26,7 @@ public class ActivateAsSorceryManaAbility extends SimpleManaAbility {
public ActivateAsSorceryManaAbility copy() {
return new ActivateAsSorceryManaAbility(this);
}
-
+
@Override
public String getRule() {
return super.getRule() + " Activate only as a sorcery.";
diff --git a/Mage/src/main/java/mage/abilities/mana/ActivatedManaAbilityImpl.java b/Mage/src/main/java/mage/abilities/mana/ActivatedManaAbilityImpl.java
index f6fd9becc71..46771ddbdd8 100644
--- a/Mage/src/main/java/mage/abilities/mana/ActivatedManaAbilityImpl.java
+++ b/Mage/src/main/java/mage/abilities/mana/ActivatedManaAbilityImpl.java
@@ -33,7 +33,7 @@ public abstract class ActivatedManaAbilityImpl extends ActivatedAbilityImpl impl
}
}
- public ActivatedManaAbilityImpl(final ActivatedManaAbilityImpl ability) {
+ protected ActivatedManaAbilityImpl(final ActivatedManaAbilityImpl ability) {
super(ability);
this.netMana.addAll(ability.netMana);
this.undoPossible = ability.undoPossible;
@@ -102,7 +102,7 @@ public abstract class ActivatedManaAbilityImpl extends ActivatedAbilityImpl impl
}
}
}
- return poolDependantNetMana;
+ return poolDependantNetMana;
}
return getNetMana(game);
}
diff --git a/Mage/src/main/java/mage/abilities/mana/AnyColorCardInYourGraveyardManaAbility.java b/Mage/src/main/java/mage/abilities/mana/AnyColorCardInYourGraveyardManaAbility.java
index e7aa2822253..85801b0b3dd 100644
--- a/Mage/src/main/java/mage/abilities/mana/AnyColorCardInYourGraveyardManaAbility.java
+++ b/Mage/src/main/java/mage/abilities/mana/AnyColorCardInYourGraveyardManaAbility.java
@@ -28,7 +28,7 @@ public class AnyColorCardInYourGraveyardManaAbility extends ActivatedManaAbility
super(Zone.BATTLEFIELD, new AnyColorCardInYourGraveyardManaEffect(cardFilter), new TapSourceCost());
}
- public AnyColorCardInYourGraveyardManaAbility(final AnyColorCardInYourGraveyardManaAbility ability) {
+ protected AnyColorCardInYourGraveyardManaAbility(final AnyColorCardInYourGraveyardManaAbility ability) {
super(ability);
}
@@ -59,10 +59,10 @@ class AnyColorCardInYourGraveyardManaEffect extends ManaEffect {
super();
filter = cardFilter;
staticText = "Add one mana of any color" +
- " among " + cardFilter.getMessage() + " in your graveyard.";
+ " among " + cardFilter.getMessage() + " in your graveyard.";
}
- public AnyColorCardInYourGraveyardManaEffect(final AnyColorCardInYourGraveyardManaEffect effect) {
+ protected AnyColorCardInYourGraveyardManaEffect(final AnyColorCardInYourGraveyardManaEffect effect) {
super(effect);
this.filter = effect.filter.copy();
}
@@ -105,9 +105,9 @@ class AnyColorCardInYourGraveyardManaEffect extends ManaEffect {
inManaTypeCalculation = true;
Set
* A LinkedHashSet is used to get the performance benefits of automatic de-duplication of the Mana
* to avoid performance issues related with manual de-duplication (see https://github.com/magefree/mage/issues/7710).
- *
*/
public class ManaOptions extends LinkedHashSet
* NOTE: Do not use in tight loops as performance of the lookup is much worse than
- * for ArrayList (the previous superclass of ManaOptions).
+ * for ArrayList (the previous superclass of ManaOptions).
*/
public Mana getAtIndex(int i) {
- if (i < 0 || i >= this.size()) {
- throw new IndexOutOfBoundsException();
- }
- Iterator
* Warning, don't use a changeable data in step's implementations
* TODO: implement copyable<> interface and copy usage in GameState
*
@@ -36,7 +37,7 @@ public abstract class Step implements Serializable {
this.hasPriority = hasPriority;
}
- public Step(final Step step) {
+ protected Step(final Step step) {
this.type = step.type;
this.hasPriority = step.hasPriority;
this.stepEvent = step.stepEvent;
diff --git a/Mage/src/main/java/mage/game/turn/Turn.java b/Mage/src/main/java/mage/game/turn/Turn.java
index 01ffc5134a7..0f41bb2ac11 100644
--- a/Mage/src/main/java/mage/game/turn/Turn.java
+++ b/Mage/src/main/java/mage/game/turn/Turn.java
@@ -40,7 +40,7 @@ public class Turn implements Serializable {
phases.add(new EndPhase());
}
- public Turn(final Turn turn) {
+ protected Turn(final Turn turn) {
if (turn.currentPhase != null) {
this.currentPhase = turn.currentPhase.copy();
}
diff --git a/Mage/src/main/java/mage/game/turn/UntapStep.java b/Mage/src/main/java/mage/game/turn/UntapStep.java
index 658fba2190b..fcaf7db4c92 100644
--- a/Mage/src/main/java/mage/game/turn/UntapStep.java
+++ b/Mage/src/main/java/mage/game/turn/UntapStep.java
@@ -22,7 +22,7 @@ public class UntapStep extends Step {
this.postStepEvent = EventType.UNTAP_STEP_POST;
}
- public UntapStep(final UntapStep step) {
+ protected UntapStep(final UntapStep step) {
super(step);
}
diff --git a/Mage/src/main/java/mage/game/turn/UpkeepStep.java b/Mage/src/main/java/mage/game/turn/UpkeepStep.java
index 33a017fd84f..2beab6d25ce 100644
--- a/Mage/src/main/java/mage/game/turn/UpkeepStep.java
+++ b/Mage/src/main/java/mage/game/turn/UpkeepStep.java
@@ -6,7 +6,6 @@ import mage.constants.PhaseStep;
import mage.game.events.GameEvent.EventType;
/**
- *
* @author BetaSteward_at_googlemail.com
*/
public class UpkeepStep extends Step {
@@ -18,7 +17,7 @@ public class UpkeepStep extends Step {
this.postStepEvent = EventType.UPKEEP_STEP_POST;
}
- public UpkeepStep(final UpkeepStep step) {
+ protected UpkeepStep(final UpkeepStep step) {
super(step);
}
diff --git a/Mage/src/main/java/mage/players/Library.java b/Mage/src/main/java/mage/players/Library.java
index 01c6e90f063..36798050c4b 100644
--- a/Mage/src/main/java/mage/players/Library.java
+++ b/Mage/src/main/java/mage/players/Library.java
@@ -23,7 +23,7 @@ public class Library implements Serializable {
this.playerId = playerId;
}
- public Library(final Library lib) {
+ protected Library(final Library lib) {
this.emptyDraw = lib.emptyDraw;
this.playerId = lib.playerId;
for (UUID id : lib.library) {
@@ -239,8 +239,9 @@ public class Library implements Serializable {
/**
* Tests only -- find card position in library
+ *
* @param cardId
- * @return
+ * @return
*/
public int getCardPosition(UUID cardId) {
UUID[] list = library.toArray(new UUID[0]);
diff --git a/Mage/src/main/java/mage/players/ManaPool.java b/Mage/src/main/java/mage/players/ManaPool.java
index f0adeaede5e..1b7a6304b89 100644
--- a/Mage/src/main/java/mage/players/ManaPool.java
+++ b/Mage/src/main/java/mage/players/ManaPool.java
@@ -59,7 +59,7 @@ public class ManaPool implements Serializable {
forcedToPay = false;
}
- public ManaPool(final ManaPool pool) {
+ protected ManaPool(final ManaPool pool) {
this.playerId = pool.playerId;
for (ManaPoolItem item : pool.manaItems) {
manaItems.add(item.copy());
diff --git a/Mage/src/main/java/mage/players/ManaPoolItem.java b/Mage/src/main/java/mage/players/ManaPoolItem.java
index 864b8764844..0c8f93619e8 100644
--- a/Mage/src/main/java/mage/players/ManaPoolItem.java
+++ b/Mage/src/main/java/mage/players/ManaPoolItem.java
@@ -2,6 +2,7 @@ package mage.players;
import java.io.Serializable;
import java.util.UUID;
+
import mage.ConditionalMana;
import mage.MageObject;
import mage.Mana;
@@ -10,7 +11,6 @@ import mage.constants.Duration;
import mage.constants.ManaType;
/**
- *
* @author BetaSteward_at_googlemail.com
*/
public class ManaPoolItem implements Serializable, Emptiable {
@@ -54,7 +54,7 @@ public class ManaPoolItem implements Serializable, Emptiable {
this.duration = Duration.EndOfStep;
}
- public ManaPoolItem(final ManaPoolItem item) {
+ protected ManaPoolItem(final ManaPoolItem item) {
this.red = item.red;
this.green = item.green;
this.blue = item.blue;
diff --git a/Mage/src/main/java/mage/players/PlayableObjectStats.java b/Mage/src/main/java/mage/players/PlayableObjectStats.java
index 1a847c82ef8..7897099bff7 100644
--- a/Mage/src/main/java/mage/players/PlayableObjectStats.java
+++ b/Mage/src/main/java/mage/players/PlayableObjectStats.java
@@ -64,7 +64,7 @@ public class PlayableObjectStats implements Serializable, Copyable
Cipher (Then you may exile this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost.)";
}
- public CipherEffect(final CipherEffect effect) {
+ protected CipherEffect(final CipherEffect effect) {
super(effect);
}
@@ -105,7 +106,7 @@ class CipherStoreEffect extends OneShotEffect {
staticText = ruleText;
}
- public CipherStoreEffect(final CipherStoreEffect effect) {
+ protected CipherStoreEffect(final CipherStoreEffect effect) {
super(effect);
this.cipherCardId = effect.cipherCardId;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/CopyEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CopyEffect.java
index ebcaeba0bd8..69202e2cc0e 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/CopyEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/CopyEffect.java
@@ -37,7 +37,7 @@ public class CopyEffect extends ContinuousEffectImpl {
this.copyToObjectId = copyToObjectId;
}
- public CopyEffect(final CopyEffect effect) {
+ protected CopyEffect(final CopyEffect effect) {
super(effect);
this.copyFromObject = effect.copyFromObject.copy();
this.copyToObjectId = effect.copyToObjectId;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/CopyPermanentEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CopyPermanentEffect.java
index 9b446d1fd08..941267142ab 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/CopyPermanentEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/CopyPermanentEffect.java
@@ -64,7 +64,7 @@ public class CopyPermanentEffect extends OneShotEffect {
this.staticText = text;
}
- public CopyPermanentEffect(final CopyPermanentEffect effect) {
+ protected CopyPermanentEffect(final CopyPermanentEffect effect) {
super(effect);
this.filter = effect.filter.copy();
this.applier = effect.applier;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/CopyTargetStackAbilityEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CopyTargetStackAbilityEffect.java
index d8688d03f65..181dcc0fef5 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/CopyTargetStackAbilityEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/CopyTargetStackAbilityEffect.java
@@ -16,7 +16,7 @@ public class CopyTargetStackAbilityEffect extends OneShotEffect {
super(Outcome.Copy);
}
- public CopyTargetStackAbilityEffect(final CopyTargetStackAbilityEffect effect) {
+ protected CopyTargetStackAbilityEffect(final CopyTargetStackAbilityEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/CopyTokenEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CopyTokenEffect.java
index 226d40dbe13..c1f8414dd52 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/CopyTokenEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/CopyTokenEffect.java
@@ -17,7 +17,7 @@ public class CopyTokenEffect extends ContinuousEffectImpl {
staticText = "You may have {this} enter the battlefield as a copy of " + token.getDescription() + " on the battlefield";
}
- public CopyTokenEffect(final CopyTokenEffect effect) {
+ protected CopyTokenEffect(final CopyTokenEffect effect) {
super(effect);
this.token = effect.token.copy();
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/CounterTargetWithReplacementEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CounterTargetWithReplacementEffect.java
index dfe6ceac810..be3afcddf44 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/CounterTargetWithReplacementEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/CounterTargetWithReplacementEffect.java
@@ -16,7 +16,6 @@ public class CounterTargetWithReplacementEffect extends OneShotEffect {
private final PutCards putIt;
/**
- *
* @param putIt
*/
public CounterTargetWithReplacementEffect(PutCards putIt) {
@@ -24,7 +23,7 @@ public class CounterTargetWithReplacementEffect extends OneShotEffect {
this.putIt = putIt;
}
- public CounterTargetWithReplacementEffect(final CounterTargetWithReplacementEffect effect) {
+ protected CounterTargetWithReplacementEffect(final CounterTargetWithReplacementEffect effect) {
super(effect);
this.putIt = effect.putIt;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/CounterUnlessPaysEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CounterUnlessPaysEffect.java
index 83a0edf42fa..c020c65bd18 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/CounterUnlessPaysEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/CounterUnlessPaysEffect.java
@@ -42,7 +42,7 @@ public class CounterUnlessPaysEffect extends OneShotEffect {
this.exile = exile;
}
- public CounterUnlessPaysEffect(final CounterUnlessPaysEffect effect) {
+ protected CounterUnlessPaysEffect(final CounterUnlessPaysEffect effect) {
super(effect);
if (effect.cost != null) {
this.cost = effect.cost.copy();
diff --git a/Mage/src/main/java/mage/abilities/effects/common/CreateDelayedTriggeredAbilityEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CreateDelayedTriggeredAbilityEffect.java
index 39031a4b833..52426022ba9 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/CreateDelayedTriggeredAbilityEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/CreateDelayedTriggeredAbilityEffect.java
@@ -32,7 +32,7 @@ public class CreateDelayedTriggeredAbilityEffect extends OneShotEffect {
this.rulePrefix = rulePrefix;
}
- public CreateDelayedTriggeredAbilityEffect(final CreateDelayedTriggeredAbilityEffect effect) {
+ protected CreateDelayedTriggeredAbilityEffect(final CreateDelayedTriggeredAbilityEffect effect) {
super(effect);
this.ability = effect.ability.copy();
this.copyTargets = effect.copyTargets;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/CreateSpecialActionEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CreateSpecialActionEffect.java
index 3d760dcee47..d8c1fc8a517 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/CreateSpecialActionEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/CreateSpecialActionEffect.java
@@ -18,7 +18,7 @@ public class CreateSpecialActionEffect extends OneShotEffect {
this.action = action;
}
- public CreateSpecialActionEffect(final CreateSpecialActionEffect effect) {
+ protected CreateSpecialActionEffect(final CreateSpecialActionEffect effect) {
super(effect);
this.action = (SpecialAction) effect.action.copy();
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/CreateTokenCopyTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CreateTokenCopyTargetEffect.java
index 377c04a9155..6760da2a668 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/CreateTokenCopyTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/CreateTokenCopyTargetEffect.java
@@ -125,7 +125,7 @@ public class CreateTokenCopyTargetEffect extends OneShotEffect {
this.additionalAbilities = new ArrayList<>();
}
- public CreateTokenCopyTargetEffect(final CreateTokenCopyTargetEffect effect) {
+ protected CreateTokenCopyTargetEffect(final CreateTokenCopyTargetEffect effect) {
super(effect);
this.abilityClazzesToRemove = new HashSet<>(effect.abilityClazzesToRemove);
diff --git a/Mage/src/main/java/mage/abilities/effects/common/CreatureExploresTriggeredAbility.java b/Mage/src/main/java/mage/abilities/effects/common/CreatureExploresTriggeredAbility.java
index 73d5fcac147..97e655eee66 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/CreatureExploresTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/CreatureExploresTriggeredAbility.java
@@ -14,7 +14,7 @@ public class CreatureExploresTriggeredAbility extends TriggeredAbilityImpl {
setTriggerPhrase("Whenever a creature you control explores, ");
}
- public CreatureExploresTriggeredAbility(final CreatureExploresTriggeredAbility effect) {
+ protected CreatureExploresTriggeredAbility(final CreatureExploresTriggeredAbility effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/CrewsVehicleSourceTriggeredAbility.java b/Mage/src/main/java/mage/abilities/effects/common/CrewsVehicleSourceTriggeredAbility.java
index fad84ced494..3f684fa2ff3 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/CrewsVehicleSourceTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/CrewsVehicleSourceTriggeredAbility.java
@@ -16,7 +16,7 @@ public class CrewsVehicleSourceTriggeredAbility extends TriggeredAbilityImpl {
setTriggerPhrase("Whenever {this} crews a Vehicle, ");
}
- public CrewsVehicleSourceTriggeredAbility(final CrewsVehicleSourceTriggeredAbility ability) {
+ protected CrewsVehicleSourceTriggeredAbility(final CrewsVehicleSourceTriggeredAbility ability) {
super(ability);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageAllControlledTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageAllControlledTargetEffect.java
index 3b30b9e8799..2ea8d78495f 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DamageAllControlledTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DamageAllControlledTargetEffect.java
@@ -13,7 +13,6 @@ import mage.game.permanent.Permanent;
import mage.players.Player;
/**
- *
* @author BetaSteward_at_googlemail.com
*/
public class DamageAllControlledTargetEffect extends OneShotEffect {
@@ -50,7 +49,7 @@ public class DamageAllControlledTargetEffect extends OneShotEffect {
this.filter = filter;
}
- public DamageAllControlledTargetEffect(final DamageAllControlledTargetEffect effect) {
+ protected DamageAllControlledTargetEffect(final DamageAllControlledTargetEffect effect) {
super(effect);
this.amount = effect.amount.copy();
this.filter = effect.filter.copy();
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageAllEffect.java
index 6d2172f7d07..926e5d2bb40 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DamageAllEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DamageAllEffect.java
@@ -2,6 +2,7 @@
package mage.abilities.effects.common;
import java.util.List;
+
import mage.abilities.Ability;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.dynamicvalue.common.StaticValue;
@@ -12,7 +13,6 @@ import mage.game.Game;
import mage.game.permanent.Permanent;
/**
- *
* @author BetaSteward_at_googlemail.com
*/
public class DamageAllEffect extends OneShotEffect {
@@ -40,7 +40,7 @@ public class DamageAllEffect extends OneShotEffect {
setText();
}
- public DamageAllEffect(final DamageAllEffect effect) {
+ protected DamageAllEffect(final DamageAllEffect effect) {
super(effect);
this.amount = effect.amount;
this.filter = effect.filter.copy();
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageAttachedControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageAttachedControllerEffect.java
index 401d8e49cba..ac85b90d186 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DamageAttachedControllerEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DamageAttachedControllerEffect.java
@@ -28,7 +28,7 @@ public class DamageAttachedControllerEffect extends OneShotEffect {
this.staticText = "{this} deals " + amount + " damage to that creature's controller";
}
- public DamageAttachedControllerEffect(final DamageAttachedControllerEffect effect) {
+ protected DamageAttachedControllerEffect(final DamageAttachedControllerEffect effect) {
super(effect);
this.amount = effect.amount;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageAttachedEffect.java
index 2a858c8f419..4047bd3f334 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DamageAttachedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DamageAttachedEffect.java
@@ -11,7 +11,6 @@ import mage.game.Game;
import mage.game.permanent.Permanent;
/**
- *
* @author LoneFox
*/
public class DamageAttachedEffect extends OneShotEffect {
@@ -36,7 +35,7 @@ public class DamageAttachedEffect extends OneShotEffect {
this.staticText = whoDealDamageName + " deals " + amount + " damage to enchanted creature";
}
- public DamageAttachedEffect(final DamageAttachedEffect effect) {
+ protected DamageAttachedEffect(final DamageAttachedEffect effect) {
super(effect);
this.amount = effect.amount;
}
@@ -58,7 +57,7 @@ public class DamageAttachedEffect extends OneShotEffect {
return false;
}
Permanent enchanted = game.getPermanentOrLKIBattlefield(enchantment.getAttachedTo());
- if(enchanted == null) {
+ if (enchanted == null) {
return false;
}
enchanted.damage(amount.calculate(game, source, this), source.getSourceId(), source, game, false, true);
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageControllerEffect.java
index 616ea253b5d..59caa6ed536 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DamageControllerEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DamageControllerEffect.java
@@ -10,7 +10,6 @@ import mage.game.Game;
import mage.players.Player;
/**
- *
* @author BetaSteward_at_googlemail.com
*/
public class DamageControllerEffect extends OneShotEffect {
@@ -50,7 +49,7 @@ public class DamageControllerEffect extends OneShotEffect {
this.sourceName = whoDealDamageName;
}
- public DamageControllerEffect(final DamageControllerEffect effect) {
+ protected DamageControllerEffect(final DamageControllerEffect effect) {
super(effect);
this.amount = effect.amount;
this.preventable = effect.preventable;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageEachOtherEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageEachOtherEffect.java
index 0dfd43bab84..2e369850e2d 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DamageEachOtherEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DamageEachOtherEffect.java
@@ -10,7 +10,6 @@ import mage.game.Game;
import mage.game.permanent.Permanent;
/**
- *
* @author LoneFox
*/
public class DamageEachOtherEffect extends OneShotEffect {
@@ -19,7 +18,7 @@ public class DamageEachOtherEffect extends OneShotEffect {
super(Outcome.Damage);
}
- public DamageEachOtherEffect(final DamageEachOtherEffect effect) {
+ protected DamageEachOtherEffect(final DamageEachOtherEffect effect) {
super(effect);
}
@@ -52,7 +51,7 @@ public class DamageEachOtherEffect extends OneShotEffect {
@Override
public String getText(Mode mode) {
- if(staticText != null && !staticText.isEmpty()) {
+ if (staticText != null && !staticText.isEmpty()) {
return staticText;
}
return "{this} deals damage equal to its power to target creature. That creature deals damage equal to its power to {this}";
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageEverythingEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageEverythingEffect.java
index e6433a9a8b3..028296ee17c 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DamageEverythingEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DamageEverythingEffect.java
@@ -59,7 +59,7 @@ public class DamageEverythingEffect extends OneShotEffect {
staticText = this.sourceName + " deals " + this.amount.toString() + " damage to each " + this.filter.getMessage() + " and each player";
}
- public DamageEverythingEffect(final DamageEverythingEffect effect) {
+ protected DamageEverythingEffect(final DamageEverythingEffect effect) {
super(effect);
this.amount = effect.amount;
this.filter = effect.filter;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageMultiEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageMultiEffect.java
index ce3d09365b0..57cb0c4dc13 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DamageMultiEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DamageMultiEffect.java
@@ -37,7 +37,7 @@ public class DamageMultiEffect extends OneShotEffect {
this.amount = amount;
}
- public DamageMultiEffect(final DamageMultiEffect effect) {
+ protected DamageMultiEffect(final DamageMultiEffect effect) {
super(effect);
this.damagedSet.addAll(effect.damagedSet);
this.amount = effect.amount;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamagePlayersEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamagePlayersEffect.java
index 7504fc3ebd1..5b002e2e8bb 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DamagePlayersEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DamagePlayersEffect.java
@@ -50,7 +50,7 @@ public class DamagePlayersEffect extends OneShotEffect {
}
- public DamagePlayersEffect(final DamagePlayersEffect effect) {
+ protected DamagePlayersEffect(final DamagePlayersEffect effect) {
super(effect);
this.amount = effect.amount;
this.controller = effect.controller;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageSelfEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageSelfEffect.java
index 8d195f5fba8..abb20fe5ee1 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DamageSelfEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DamageSelfEffect.java
@@ -9,11 +9,10 @@ import mage.game.Game;
import mage.game.permanent.Permanent;
/**
- *
* @author North, Quercitron
*/
public class DamageSelfEffect extends OneShotEffect {
-
+
protected int amount;
public DamageSelfEffect(int amount) {
@@ -21,7 +20,7 @@ public class DamageSelfEffect extends OneShotEffect {
this.amount = amount;
}
- public DamageSelfEffect(final DamageSelfEffect effect) {
+ protected DamageSelfEffect(final DamageSelfEffect effect) {
super(effect);
this.amount = effect.amount;
}
@@ -40,7 +39,7 @@ public class DamageSelfEffect extends OneShotEffect {
}
return false;
}
-
+
@Override
public String getText(Mode mode) {
if (staticText != null && !staticText.isEmpty()) {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageTargetControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageTargetControllerEffect.java
index affd1a9f588..51f2789b2ca 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DamageTargetControllerEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DamageTargetControllerEffect.java
@@ -36,7 +36,7 @@ public class DamageTargetControllerEffect extends OneShotEffect {
this.preventable = preventable;
}
- public DamageTargetControllerEffect(final DamageTargetControllerEffect effect) {
+ protected DamageTargetControllerEffect(final DamageTargetControllerEffect effect) {
super(effect);
amount = effect.amount.copy();
preventable = effect.preventable;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageTargetEffect.java
index 9403b657552..df03d47f5ab 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DamageTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DamageTargetEffect.java
@@ -86,7 +86,7 @@ public class DamageTargetEffect extends OneShotEffect {
this.amount = amount;
}
- public DamageTargetEffect(final DamageTargetEffect effect) {
+ protected DamageTargetEffect(final DamageTargetEffect effect) {
super(effect);
this.amount = effect.amount.copy();
this.preventable = effect.preventable;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageWithPowerFromOneToAnotherTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageWithPowerFromOneToAnotherTargetEffect.java
index 95e88c87f64..20fb659b97f 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DamageWithPowerFromOneToAnotherTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DamageWithPowerFromOneToAnotherTargetEffect.java
@@ -30,7 +30,7 @@ public class DamageWithPowerFromOneToAnotherTargetEffect extends OneShotEffect {
this.multiplier = multiplier;
}
- public DamageWithPowerFromOneToAnotherTargetEffect(final DamageWithPowerFromOneToAnotherTargetEffect effect) {
+ protected DamageWithPowerFromOneToAnotherTargetEffect(final DamageWithPowerFromOneToAnotherTargetEffect effect) {
super(effect);
this.firstTargetName = effect.firstTargetName;
this.multiplier = effect.multiplier;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageWithPowerFromSourceToAnotherTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageWithPowerFromSourceToAnotherTargetEffect.java
index 5be2ea79ee2..555f36a4f8f 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DamageWithPowerFromSourceToAnotherTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DamageWithPowerFromSourceToAnotherTargetEffect.java
@@ -24,7 +24,7 @@ public class DamageWithPowerFromSourceToAnotherTargetEffect extends OneShotEffec
this.sourceTargetName = sourceTargetName;
}
- public DamageWithPowerFromSourceToAnotherTargetEffect(final DamageWithPowerFromSourceToAnotherTargetEffect effect) {
+ protected DamageWithPowerFromSourceToAnotherTargetEffect(final DamageWithPowerFromSourceToAnotherTargetEffect effect) {
super(effect);
this.sourceTargetName = effect.sourceTargetName;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DestroyAllAttachedToTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DestroyAllAttachedToTargetEffect.java
index 83976cc5ab8..07ccb68894f 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DestroyAllAttachedToTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DestroyAllAttachedToTargetEffect.java
@@ -3,6 +3,7 @@ package mage.abilities.effects.common;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
+
import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
import mage.constants.Outcome;
@@ -12,7 +13,6 @@ import mage.game.permanent.Permanent;
import mage.filter.FilterPermanent;
/**
- *
* @author awjackson
*/
public class DestroyAllAttachedToTargetEffect extends OneShotEffect {
@@ -25,7 +25,7 @@ public class DestroyAllAttachedToTargetEffect extends OneShotEffect {
this.staticText = "destroy all " + filter.getMessage() + " attached to " + description;
}
- public DestroyAllAttachedToTargetEffect(final DestroyAllAttachedToTargetEffect effect) {
+ protected DestroyAllAttachedToTargetEffect(final DestroyAllAttachedToTargetEffect effect) {
super(effect);
this.filter = effect.filter;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DestroyAllControlledTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DestroyAllControlledTargetEffect.java
index 98cc806c651..a6df0295b5b 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DestroyAllControlledTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DestroyAllControlledTargetEffect.java
@@ -20,7 +20,7 @@ public class DestroyAllControlledTargetEffect extends OneShotEffect {
staticText = "Destroy all " + filter.getMessage() + " target player controls";
}
- public DestroyAllControlledTargetEffect(final DestroyAllControlledTargetEffect effect) {
+ protected DestroyAllControlledTargetEffect(final DestroyAllControlledTargetEffect effect) {
super(effect);
this.filter = effect.filter.copy();
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DestroyAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DestroyAllEffect.java
index e2c4d522270..84b00fc22ee 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DestroyAllEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DestroyAllEffect.java
@@ -31,7 +31,7 @@ public class DestroyAllEffect extends OneShotEffect {
}
}
- public DestroyAllEffect(final DestroyAllEffect effect) {
+ protected DestroyAllEffect(final DestroyAllEffect effect) {
super(effect);
this.filter = effect.filter.copy();
this.noRegen = effect.noRegen;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DestroyAllNamedPermanentsEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DestroyAllNamedPermanentsEffect.java
index 68a0f79a465..f1d0139ab83 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DestroyAllNamedPermanentsEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DestroyAllNamedPermanentsEffect.java
@@ -20,7 +20,7 @@ public class DestroyAllNamedPermanentsEffect extends OneShotEffect {
super(Outcome.DestroyPermanent);
}
- public DestroyAllNamedPermanentsEffect(final DestroyAllNamedPermanentsEffect effect) {
+ protected DestroyAllNamedPermanentsEffect(final DestroyAllNamedPermanentsEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DestroyAttachedToEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DestroyAttachedToEffect.java
index d18a28769bb..10f8a0aed3b 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DestroyAttachedToEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DestroyAttachedToEffect.java
@@ -8,7 +8,6 @@ import mage.game.Game;
import mage.game.permanent.Permanent;
/**
- *
* @author LoneFox
*/
public class DestroyAttachedToEffect extends OneShotEffect {
@@ -28,7 +27,7 @@ public class DestroyAttachedToEffect extends OneShotEffect {
}
}
- public DestroyAttachedToEffect(final DestroyAttachedToEffect effect) {
+ protected DestroyAttachedToEffect(final DestroyAttachedToEffect effect) {
super(effect);
this.noRegen = effect.noRegen;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DestroyEquippedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DestroyEquippedEffect.java
index c5464ee044c..318fd796b00 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DestroyEquippedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DestroyEquippedEffect.java
@@ -1,6 +1,7 @@
package mage.abilities.effects.common;
import java.util.UUID;
+
import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
import mage.constants.Outcome;
@@ -8,7 +9,6 @@ import mage.game.Game;
import mage.game.permanent.Permanent;
/**
- *
* @author LevelX2
*/
public class DestroyEquippedEffect extends OneShotEffect {
@@ -18,7 +18,7 @@ public class DestroyEquippedEffect extends OneShotEffect {
staticText = "destroy that permanent";
}
- public DestroyEquippedEffect(final DestroyEquippedEffect effect) {
+ protected DestroyEquippedEffect(final DestroyEquippedEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DestroySourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DestroySourceEffect.java
index 962010d49b9..87adad19f96 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DestroySourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DestroySourceEffect.java
@@ -8,7 +8,6 @@ import mage.game.Game;
import mage.game.permanent.Permanent;
/**
- *
* @author BetaSteward_at_googlemail.com
*/
public class DestroySourceEffect extends OneShotEffect {
@@ -25,7 +24,7 @@ public class DestroySourceEffect extends OneShotEffect {
staticText = "destroy {this}";
}
- public DestroySourceEffect(final DestroySourceEffect effect) {
+ protected DestroySourceEffect(final DestroySourceEffect effect) {
super(effect);
this.noRegen = effect.noRegen;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DestroyTargetAtBeginningOfNextEndStepEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DestroyTargetAtBeginningOfNextEndStepEffect.java
index bf15998a409..f60ecaf1e34 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DestroyTargetAtBeginningOfNextEndStepEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DestroyTargetAtBeginningOfNextEndStepEffect.java
@@ -9,7 +9,6 @@ import mage.game.Game;
import mage.target.targetpointer.FixedTarget;
/**
- *
* @author LoneFox
*/
public class DestroyTargetAtBeginningOfNextEndStepEffect extends OneShotEffect {
@@ -19,7 +18,7 @@ public class DestroyTargetAtBeginningOfNextEndStepEffect extends OneShotEffect {
this.staticText = "Destroy that creature at the beginning of the next end step";
}
- public DestroyTargetAtBeginningOfNextEndStepEffect(final DestroyTargetAtBeginningOfNextEndStepEffect effect) {
+ protected DestroyTargetAtBeginningOfNextEndStepEffect(final DestroyTargetAtBeginningOfNextEndStepEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DestroyTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DestroyTargetEffect.java
index 42774b51903..cbd5b9bc1c8 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DestroyTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DestroyTargetEffect.java
@@ -38,7 +38,7 @@ public class DestroyTargetEffect extends OneShotEffect {
staticText = ruleText;
}
- public DestroyTargetEffect(final DestroyTargetEffect effect) {
+ protected DestroyTargetEffect(final DestroyTargetEffect effect) {
super(effect);
this.noRegen = effect.noRegen;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DetainAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DetainAllEffect.java
index beaf758408b..323e3577ca4 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DetainAllEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DetainAllEffect.java
@@ -29,7 +29,7 @@ public class DetainAllEffect extends OneShotEffect {
this.staticText = "detain " + filter.getMessage();
}
- public DetainAllEffect(final DetainAllEffect effect) {
+ protected DetainAllEffect(final DetainAllEffect effect) {
super(effect);
this.filter = effect.filter;
}
@@ -65,7 +65,7 @@ class DetainAllRestrictionEffect extends RestrictionEffect {
staticText = "";
}
- public DetainAllRestrictionEffect(final DetainAllRestrictionEffect effect) {
+ protected DetainAllRestrictionEffect(final DetainAllRestrictionEffect effect) {
super(effect);
this.detainedObjects = effect.detainedObjects;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DetainTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DetainTargetEffect.java
index a709bc94b18..ce387af2e37 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DetainTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DetainTargetEffect.java
@@ -37,7 +37,7 @@ public class DetainTargetEffect extends OneShotEffect {
staticText = ruleText;
}
- public DetainTargetEffect(final DetainTargetEffect effect) {
+ protected DetainTargetEffect(final DetainTargetEffect effect) {
super(effect);
}
@@ -99,7 +99,7 @@ class DetainRestrictionEffect extends RestrictionEffect {
staticText = "";
}
- public DetainRestrictionEffect(final DetainRestrictionEffect effect) {
+ protected DetainRestrictionEffect(final DetainRestrictionEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DiscardOntoBattlefieldEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DiscardOntoBattlefieldEffect.java
index 43cae9b0e57..60b50577bef 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DiscardOntoBattlefieldEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DiscardOntoBattlefieldEffect.java
@@ -15,7 +15,6 @@ import mage.game.stack.StackObject;
import mage.players.Player;
/**
- *
* @author LoneFox
*/
public class DiscardOntoBattlefieldEffect extends ReplacementEffectImpl {
@@ -25,7 +24,7 @@ public class DiscardOntoBattlefieldEffect extends ReplacementEffectImpl {
staticText = "If a spell or ability an opponent controls causes you to discard {this}, put it onto the battlefield instead of putting it into your graveyard";
}
- public DiscardOntoBattlefieldEffect(final DiscardOntoBattlefieldEffect effect) {
+ protected DiscardOntoBattlefieldEffect(final DiscardOntoBattlefieldEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DoIfClashWonEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DoIfClashWonEffect.java
index 3ff4bf4c5a1..30c9d2e0c62 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DoIfClashWonEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DoIfClashWonEffect.java
@@ -31,7 +31,7 @@ public class DoIfClashWonEffect extends OneShotEffect {
this.setTargetPointerToClashedOpponent = setTargetPointerToClashedOpponent;
}
- public DoIfClashWonEffect(final DoIfClashWonEffect effect) {
+ protected DoIfClashWonEffect(final DoIfClashWonEffect effect) {
super(effect);
this.executingEffect = effect.executingEffect.copy();
this.setTargetPointerToClashedOpponent = effect.setTargetPointerToClashedOpponent;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DoIfCostPaid.java b/Mage/src/main/java/mage/abilities/effects/common/DoIfCostPaid.java
index 6db6728c292..95af188d55a 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DoIfCostPaid.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DoIfCostPaid.java
@@ -50,7 +50,7 @@ public class DoIfCostPaid extends OneShotEffect {
this.optional = optional;
}
- public DoIfCostPaid(final DoIfCostPaid effect) {
+ protected DoIfCostPaid(final DoIfCostPaid effect) {
super(effect);
this.executingEffects = effect.executingEffects.copy();
this.otherwiseEffects = effect.otherwiseEffects.copy();
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DoUnlessAnyPlayerPaysEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DoUnlessAnyPlayerPaysEffect.java
index 47605b3748d..5e6e1d8c25e 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DoUnlessAnyPlayerPaysEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DoUnlessAnyPlayerPaysEffect.java
@@ -44,7 +44,7 @@ public class DoUnlessAnyPlayerPaysEffect extends OneShotEffect {
this.chooseUseText = chooseUseText;
}
- public DoUnlessAnyPlayerPaysEffect(final DoUnlessAnyPlayerPaysEffect effect) {
+ protected DoUnlessAnyPlayerPaysEffect(final DoUnlessAnyPlayerPaysEffect effect) {
super(effect);
if (effect.cost != null) {
this.cost = effect.cost.copy();
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DoUnlessAttachedControllerPaysEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DoUnlessAttachedControllerPaysEffect.java
index 1104846c589..937df635a25 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DoUnlessAttachedControllerPaysEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DoUnlessAttachedControllerPaysEffect.java
@@ -14,7 +14,6 @@ import mage.players.Player;
import mage.util.CardUtil;
/**
- *
* @author jeffwadsworth
*/
public class DoUnlessAttachedControllerPaysEffect extends OneShotEffect {
@@ -34,7 +33,7 @@ public class DoUnlessAttachedControllerPaysEffect extends OneShotEffect {
this.chooseUseText = chooseUseText;
}
- public DoUnlessAttachedControllerPaysEffect(final DoUnlessAttachedControllerPaysEffect effect) {
+ protected DoUnlessAttachedControllerPaysEffect(final DoUnlessAttachedControllerPaysEffect effect) {
super(effect);
this.executingEffects = effect.executingEffects.copy();
this.cost = effect.cost.copy();
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DoUnlessControllerPaysEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DoUnlessControllerPaysEffect.java
index d92859a57ee..6614819785a 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DoUnlessControllerPaysEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DoUnlessControllerPaysEffect.java
@@ -15,7 +15,6 @@ import mage.players.Player;
import mage.util.CardUtil;
/**
- *
* @author MarcoMarin
*/
public class DoUnlessControllerPaysEffect extends OneShotEffect {
@@ -35,7 +34,7 @@ public class DoUnlessControllerPaysEffect extends OneShotEffect {
this.chooseUseText = chooseUseText;
}
- public DoUnlessControllerPaysEffect(final DoUnlessControllerPaysEffect effect) {
+ protected DoUnlessControllerPaysEffect(final DoUnlessControllerPaysEffect effect) {
super(effect);
this.executingEffects = effect.executingEffects.copy();
this.cost = effect.cost.copy();
@@ -61,7 +60,7 @@ public class DoUnlessControllerPaysEffect extends OneShotEffect {
message = CardUtil.replaceSourceName(message, sourceObject.getName());
boolean result = true;
boolean doEffect = true;
-
+
// check if controller is willing to pay
if (cost.canPay(source, source, controller.getId(), game) && controller.chooseUse(Outcome.Detriment, message, source, game)) {
cost.clearPaid();
@@ -69,7 +68,7 @@ public class DoUnlessControllerPaysEffect extends OneShotEffect {
if (!game.isSimulation()) {
game.informPlayers(controller.getLogName() + " pays the cost to prevent the effect");
}
- doEffect = false;
+ doEffect = false;
}
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DoUnlessTargetPlayerOrTargetsControllerPaysEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DoUnlessTargetPlayerOrTargetsControllerPaysEffect.java
index 4a67e5ba406..71d8c4ea4d9 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DoUnlessTargetPlayerOrTargetsControllerPaysEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DoUnlessTargetPlayerOrTargetsControllerPaysEffect.java
@@ -49,7 +49,7 @@ public class DoUnlessTargetPlayerOrTargetsControllerPaysEffect extends OneShotEf
this.genericMana = genericMana;
}
- public DoUnlessTargetPlayerOrTargetsControllerPaysEffect(final DoUnlessTargetPlayerOrTargetsControllerPaysEffect effect) {
+ protected DoUnlessTargetPlayerOrTargetsControllerPaysEffect(final DoUnlessTargetPlayerOrTargetsControllerPaysEffect effect) {
super(effect);
this.executingEffects = effect.executingEffects.copy();
this.otherwiseEffect = effect.otherwiseEffect;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DontUntapAsLongAsSourceTappedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DontUntapAsLongAsSourceTappedEffect.java
index 4fdc5473843..7ba6bbbdbde 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DontUntapAsLongAsSourceTappedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DontUntapAsLongAsSourceTappedEffect.java
@@ -10,7 +10,6 @@ import mage.game.Game;
import mage.game.events.GameEvent;
/**
- *
* @author LoneFox
*/
@@ -21,13 +20,13 @@ public class DontUntapAsLongAsSourceTappedEffect extends ConditionalContinuousRu
staticText = "It doesn't untap during its controller's untap step for as long as {this} remains tapped.";
}
- public DontUntapAsLongAsSourceTappedEffect(final DontUntapAsLongAsSourceTappedEffect effect) {
+ protected DontUntapAsLongAsSourceTappedEffect(final DontUntapAsLongAsSourceTappedEffect effect) {
super(effect);
}
@Override
public boolean applies(GameEvent event, Ability source, Game game) {
- if(event.getType() == GameEvent.EventType.UNTAP && event.getTargetId().equals(source.getSourceId())) {
+ if (event.getType() == GameEvent.EventType.UNTAP && event.getTargetId().equals(source.getSourceId())) {
effect.discard();
}
return super.applies(event, source, game);
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersNextUntapStepSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersNextUntapStepSourceEffect.java
index 742fb56ec33..94f1bb65aae 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersNextUntapStepSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersNextUntapStepSourceEffect.java
@@ -12,14 +12,14 @@ import mage.game.events.GameEvent;
public class DontUntapInControllersNextUntapStepSourceEffect extends ContinuousRuleModifyingEffectImpl {
private int validForTurnNum;
-
+
public DontUntapInControllersNextUntapStepSourceEffect() {
super(Duration.Custom, Outcome.Detriment, false, true);
staticText = "{this} doesn't untap during your next untap step";
validForTurnNum = 0;
}
- public DontUntapInControllersNextUntapStepSourceEffect(final DontUntapInControllersNextUntapStepSourceEffect effect) {
+ protected DontUntapInControllersNextUntapStepSourceEffect(final DontUntapInControllersNextUntapStepSourceEffect effect) {
super(effect);
}
@@ -52,7 +52,7 @@ public class DontUntapInControllersNextUntapStepSourceEffect extends ContinuousR
// the check for turn number is needed if multiple effects are added to prevent untap in next untap step
// if we don't check for turn number, every turn only one effect would be used instead of correctly consuming
// all existing skip the next untap step effects.
-
+
// Discard effect if related to a previous turn
if (validForTurnNum > 0 && validForTurnNum < game.getTurnNum()) {
discard();
@@ -63,7 +63,7 @@ public class DontUntapInControllersNextUntapStepSourceEffect extends ContinuousR
&& game.isActivePlayer(source.getControllerId())) {
if (validForTurnNum == game.getTurnNum()) { // the turn has a second untap step but the effect is already related to the first untap step
discard();
- return false;
+ return false;
}
validForTurnNum = game.getTurnNum();
}
@@ -72,7 +72,7 @@ public class DontUntapInControllersNextUntapStepSourceEffect extends ContinuousR
&& event.getType() == GameEvent.EventType.UNTAP
&& game.isActivePlayer(source.getControllerId())
&& event.getTargetId().equals(source.getSourceId())) {
- discard();
+ discard();
return true;
}
return false;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersNextUntapStepTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersNextUntapStepTargetEffect.java
index 95feb62ab18..92ce682a732 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersNextUntapStepTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersNextUntapStepTargetEffect.java
@@ -4,6 +4,7 @@ package mage.abilities.effects.common;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
+
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.Mode;
@@ -57,7 +58,7 @@ public class DontUntapInControllersNextUntapStepTargetEffect extends ContinuousR
this.onlyIfControlledByPlayer = onlyIfControlledByPlayer;
}
- public DontUntapInControllersNextUntapStepTargetEffect(final DontUntapInControllersNextUntapStepTargetEffect effect) {
+ protected DontUntapInControllersNextUntapStepTargetEffect(final DontUntapInControllersNextUntapStepTargetEffect effect) {
super(effect);
this.targetName = effect.targetName;
this.twoSteps = effect.twoSteps;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepAllEffect.java
index 4e6bfb850b4..3b109db119e 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepAllEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepAllEffect.java
@@ -16,8 +16,6 @@ import mage.game.permanent.Permanent;
import mage.players.Player;
/**
- *
- *
* @author LevelX2
*/
@@ -25,14 +23,14 @@ public class DontUntapInControllersUntapStepAllEffect extends ContinuousRuleModi
TargetController targetController;
FilterPermanent filter;
-
+
public DontUntapInControllersUntapStepAllEffect(Duration duration, TargetController targetController, FilterPermanent filter) {
super(duration, Outcome.Detriment, false, false);
this.targetController = targetController;
this.filter = filter;
}
- public DontUntapInControllersUntapStepAllEffect(final DontUntapInControllersUntapStepAllEffect effect) {
+ protected DontUntapInControllersUntapStepAllEffect(final DontUntapInControllersUntapStepAllEffect effect) {
super(effect);
this.targetController = effect.targetController;
this.filter = effect.filter;
@@ -47,7 +45,7 @@ public class DontUntapInControllersUntapStepAllEffect extends ContinuousRuleModi
public boolean apply(Game game, Ability source) {
return false;
}
-
+
@Override
public boolean checksEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.UNTAP;
@@ -58,7 +56,7 @@ public class DontUntapInControllersUntapStepAllEffect extends ContinuousRuleModi
if (game.getTurnStepType() == PhaseStep.UNTAP) {
Permanent permanent = game.getPermanent(event.getTargetId());
if (permanent != null) {
- switch(targetController) {
+ switch (targetController) {
case YOU:
if (!permanent.isControlledBy(source.getControllerId())) {
return false;
@@ -89,14 +87,14 @@ public class DontUntapInControllersUntapStepAllEffect extends ContinuousRuleModi
if (!staticText.isEmpty()) {
return staticText;
}
- StringBuilder sb = new StringBuilder(filter.getMessage()).append(" don't untap during ");
- switch(targetController) {
+ StringBuilder sb = new StringBuilder(filter.getMessage()).append(" don't untap during ");
+ switch (targetController) {
case ANY:
sb.append("their controllers' ");
break;
default:
throw new RuntimeException("Type of TargetController not supported yet!");
- }
+ }
sb.append("untap steps");
return sb.toString();
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepEnchantedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepEnchantedEffect.java
index 2a73ac6dc53..6623974ca01 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepEnchantedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepEnchantedEffect.java
@@ -23,7 +23,7 @@ public class DontUntapInControllersUntapStepEnchantedEffect extends ContinuousRu
staticText = "Enchanted " + description + " doesn't untap during its controller's untap step";
}
- public DontUntapInControllersUntapStepEnchantedEffect(final DontUntapInControllersUntapStepEnchantedEffect effect) {
+ protected DontUntapInControllersUntapStepEnchantedEffect(final DontUntapInControllersUntapStepEnchantedEffect effect) {
super(effect);
}
@@ -60,7 +60,7 @@ public class DontUntapInControllersUntapStepEnchantedEffect extends ContinuousRu
Permanent enchantment = game.getPermanent(source.getSourceId());
if (enchantment != null && enchantment.getAttachedTo() != null && event.getTargetId().equals(enchantment.getAttachedTo())) {
Permanent permanent = game.getPermanent(enchantment.getAttachedTo());
- if (permanent != null && permanent.isControlledBy(game.getActivePlayerId())) {
+ if (permanent != null && permanent.isControlledBy(game.getActivePlayerId())) {
return true;
}
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepSourceEffect.java
index da1808947a5..c235ef7b1f6 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepSourceEffect.java
@@ -12,7 +12,6 @@ import mage.game.events.GameEvent.EventType;
import mage.game.permanent.Permanent;
/**
- *
* @author North
*/
public class DontUntapInControllersUntapStepSourceEffect extends ContinuousRuleModifyingEffectImpl {
@@ -26,7 +25,7 @@ public class DontUntapInControllersUntapStepSourceEffect extends ContinuousRuleM
staticText = "{this} doesn't untap during your untap step";
}
- public DontUntapInControllersUntapStepSourceEffect(final DontUntapInControllersUntapStepSourceEffect effect) {
+ protected DontUntapInControllersUntapStepSourceEffect(final DontUntapInControllersUntapStepSourceEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepTargetEffect.java
index 08f1aff4421..01c0b7adc9f 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepTargetEffect.java
@@ -28,7 +28,7 @@ public class DontUntapInControllersUntapStepTargetEffect extends ContinuousRuleM
this.targetName = targetName;
}
- public DontUntapInControllersUntapStepTargetEffect(final DontUntapInControllersUntapStepTargetEffect effect) {
+ protected DontUntapInControllersUntapStepTargetEffect(final DontUntapInControllersUntapStepTargetEffect effect) {
super(effect);
this.targetName = effect.targetName;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DontUntapInPlayersNextUntapStepAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DontUntapInPlayersNextUntapStepAllEffect.java
index 9ef3496a11d..85a4afd6478 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DontUntapInPlayersNextUntapStepAllEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DontUntapInPlayersNextUntapStepAllEffect.java
@@ -35,7 +35,7 @@ public class DontUntapInPlayersNextUntapStepAllEffect extends ContinuousRuleModi
this.filter = filter;
}
- public DontUntapInPlayersNextUntapStepAllEffect(final DontUntapInPlayersNextUntapStepAllEffect effect) {
+ protected DontUntapInPlayersNextUntapStepAllEffect(final DontUntapInPlayersNextUntapStepAllEffect effect) {
super(effect);
this.validForTurnNum = effect.validForTurnNum;
this.filter = effect.filter;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DrawCardAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DrawCardAllEffect.java
index 2f2f4fb2942..d92de86e7dd 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DrawCardAllEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DrawCardAllEffect.java
@@ -2,6 +2,7 @@
package mage.abilities.effects.common;
import java.util.UUID;
+
import mage.abilities.Ability;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.dynamicvalue.common.StaticValue;
@@ -13,7 +14,6 @@ import mage.players.Player;
import mage.util.CardUtil;
/**
- *
* @author BetaSteward_at_googlemail.com
*/
public class DrawCardAllEffect extends OneShotEffect {
@@ -40,7 +40,7 @@ public class DrawCardAllEffect extends OneShotEffect {
staticText = setText();
}
- public DrawCardAllEffect(final DrawCardAllEffect effect) {
+ protected DrawCardAllEffect(final DrawCardAllEffect effect) {
super(effect);
this.amount = effect.amount;
this.targetController = effect.targetController;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DrawCardForEachColorAmongControlledPermanentsEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DrawCardForEachColorAmongControlledPermanentsEffect.java
index 771ecaa52e7..00df6e96f72 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DrawCardForEachColorAmongControlledPermanentsEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DrawCardForEachColorAmongControlledPermanentsEffect.java
@@ -18,7 +18,7 @@ public class DrawCardForEachColorAmongControlledPermanentsEffect extends OneShot
this.staticText = "Draw a card for each color among permanents you control";
}
- public DrawCardForEachColorAmongControlledPermanentsEffect(final DrawCardForEachColorAmongControlledPermanentsEffect effect) {
+ protected DrawCardForEachColorAmongControlledPermanentsEffect(final DrawCardForEachColorAmongControlledPermanentsEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DrawCardSourceControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DrawCardSourceControllerEffect.java
index bb921317149..87c881113d4 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DrawCardSourceControllerEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DrawCardSourceControllerEffect.java
@@ -36,7 +36,7 @@ public class DrawCardSourceControllerEffect extends OneShotEffect {
createStaticText(whoDrawCard);
}
- public DrawCardSourceControllerEffect(final DrawCardSourceControllerEffect effect) {
+ protected DrawCardSourceControllerEffect(final DrawCardSourceControllerEffect effect) {
super(effect);
this.amount = effect.amount.copy();
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DrawCardTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DrawCardTargetEffect.java
index b67ddd9d5b7..326336a9a56 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DrawCardTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DrawCardTargetEffect.java
@@ -1,6 +1,7 @@
package mage.abilities.effects.common;
import java.util.UUID;
+
import mage.abilities.Ability;
import mage.abilities.Mode;
import mage.abilities.dynamicvalue.DynamicValue;
@@ -14,7 +15,6 @@ import mage.target.targetpointer.SecondTargetPointer;
import mage.util.CardUtil;
/**
- *
* @author BetaSteward_at_googlemail.com
*/
public class DrawCardTargetEffect extends OneShotEffect {
@@ -46,7 +46,7 @@ public class DrawCardTargetEffect extends OneShotEffect {
this.upTo = upto;
}
- public DrawCardTargetEffect(final DrawCardTargetEffect effect) {
+ protected DrawCardTargetEffect(final DrawCardTargetEffect effect) {
super(effect);
this.amount = effect.amount.copy();
this.optional = effect.optional;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DrawDiscardControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DrawDiscardControllerEffect.java
index 9f80cb3b893..f23f739544e 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DrawDiscardControllerEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DrawDiscardControllerEffect.java
@@ -36,7 +36,7 @@ public class DrawDiscardControllerEffect extends OneShotEffect {
this.optional = optional;
}
- public DrawDiscardControllerEffect(final DrawDiscardControllerEffect effect) {
+ protected DrawDiscardControllerEffect(final DrawDiscardControllerEffect effect) {
super(effect);
this.cardsToDraw = effect.cardsToDraw;
this.cardsToDiscard = effect.cardsToDiscard;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DrawDiscardOneOfThemEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DrawDiscardOneOfThemEffect.java
index 46c0b594e76..15b89586eee 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DrawDiscardOneOfThemEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DrawDiscardOneOfThemEffect.java
@@ -15,7 +15,6 @@ import mage.target.TargetCard;
import mage.util.CardUtil;
/**
- *
* @author BetaSteward_at_googlemail.com
*/
public class DrawDiscardOneOfThemEffect extends OneShotEffect {
@@ -31,7 +30,7 @@ public class DrawDiscardOneOfThemEffect extends OneShotEffect {
+ ", then discard one of them";
}
- public DrawDiscardOneOfThemEffect(final DrawDiscardOneOfThemEffect effect) {
+ protected DrawDiscardOneOfThemEffect(final DrawDiscardOneOfThemEffect effect) {
super(effect);
this.cardsToDraw = effect.cardsToDraw;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/EnterBattlefieldPayCostOrPutGraveyardEffect.java b/Mage/src/main/java/mage/abilities/effects/common/EnterBattlefieldPayCostOrPutGraveyardEffect.java
index 64d8c3fe096..ef3f4cda17b 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/EnterBattlefieldPayCostOrPutGraveyardEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/EnterBattlefieldPayCostOrPutGraveyardEffect.java
@@ -2,6 +2,7 @@
package mage.abilities.effects.common;
import java.util.Locale;
+
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.costs.Cost;
@@ -16,7 +17,6 @@ import mage.game.events.ZoneChangeEvent;
import mage.players.Player;
/**
- *
* @author LevelX2
*/
public class EnterBattlefieldPayCostOrPutGraveyardEffect extends ReplacementEffectImpl {
@@ -29,7 +29,7 @@ public class EnterBattlefieldPayCostOrPutGraveyardEffect extends ReplacementEffe
staticText = "If {this} would enter the battlefield, " + cost.getText() + " instead. If you do, put {this} onto the battlefield. If you don't, put it into its owner's graveyard";
}
- public EnterBattlefieldPayCostOrPutGraveyardEffect(final EnterBattlefieldPayCostOrPutGraveyardEffect effect) {
+ protected EnterBattlefieldPayCostOrPutGraveyardEffect(final EnterBattlefieldPayCostOrPutGraveyardEffect effect) {
super(effect);
this.cost = effect.cost.copy();
}
@@ -53,7 +53,7 @@ public class EnterBattlefieldPayCostOrPutGraveyardEffect extends ReplacementEffe
if (cost.canPay(source, source, player.getId(), game)) {
if (player.chooseUse(outcome,
cost.getText().substring(0, 1).toUpperCase(Locale.ENGLISH) + cost.getText().substring(1)
- + "? (otherwise " + sourceObject.getLogName() + " is put into graveyard)", source, game)) {
+ + "? (otherwise " + sourceObject.getLogName() + " is put into graveyard)", source, game)) {
cost.clearPaid();
replace = !cost.pay(source, game, source, source.getControllerId(), false, null);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/EntersBattlefieldWithXCountersEffect.java b/Mage/src/main/java/mage/abilities/effects/common/EntersBattlefieldWithXCountersEffect.java
index 0be9a53763a..0b7730027d1 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/EntersBattlefieldWithXCountersEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/EntersBattlefieldWithXCountersEffect.java
@@ -44,7 +44,7 @@ public class EntersBattlefieldWithXCountersEffect extends OneShotEffect {
staticText = "with " + countText + " " + counter.getName() + " counters on it";
}
- public EntersBattlefieldWithXCountersEffect(final EntersBattlefieldWithXCountersEffect effect) {
+ protected EntersBattlefieldWithXCountersEffect(final EntersBattlefieldWithXCountersEffect effect) {
super(effect);
this.counter = effect.counter.copy();
this.multiplier = effect.multiplier;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileAdventureSpellEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileAdventureSpellEffect.java
index d2a7dd9b2ee..6dab880497d 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/ExileAdventureSpellEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/ExileAdventureSpellEffect.java
@@ -76,7 +76,7 @@ class AdventureCastFromExileEffect extends AsThoughEffectImpl {
staticText = "Then exile this card. You may cast the creature later from exile.";
}
- public AdventureCastFromExileEffect(final AdventureCastFromExileEffect effect) {
+ protected AdventureCastFromExileEffect(final AdventureCastFromExileEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileAllEffect.java
index a2fffcfa115..de5ad9d1ae2 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/ExileAllEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/ExileAllEffect.java
@@ -30,7 +30,7 @@ public class ExileAllEffect extends OneShotEffect {
setText();
}
- public ExileAllEffect(final ExileAllEffect effect) {
+ protected ExileAllEffect(final ExileAllEffect effect) {
super(effect);
this.filter = effect.filter.copy();
this.forSource = effect.forSource;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileAttachedEffect.java
index 9b2c2644830..202158dd436 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/ExileAttachedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/ExileAttachedEffect.java
@@ -9,7 +9,6 @@ import mage.game.permanent.Permanent;
import mage.players.Player;
/**
- *
* @author Styxo
*/
public class ExileAttachedEffect extends OneShotEffect {
@@ -19,7 +18,7 @@ public class ExileAttachedEffect extends OneShotEffect {
staticText = "exile enchanted creature";
}
- public ExileAttachedEffect(final ExileAttachedEffect effect) {
+ protected ExileAttachedEffect(final ExileAttachedEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileCardsFromTopOfLibraryTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileCardsFromTopOfLibraryTargetEffect.java
index 1e492430488..e59e5defd0f 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/ExileCardsFromTopOfLibraryTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/ExileCardsFromTopOfLibraryTargetEffect.java
@@ -11,7 +11,6 @@ import mage.players.Player;
import mage.util.CardUtil;
/**
- *
* @author LevelX2
*/
public class ExileCardsFromTopOfLibraryTargetEffect extends OneShotEffect {
@@ -31,7 +30,7 @@ public class ExileCardsFromTopOfLibraryTargetEffect extends OneShotEffect {
+ (amount == 1 ? "card" : " cards") + " of their library";
}
- public ExileCardsFromTopOfLibraryTargetEffect(final ExileCardsFromTopOfLibraryTargetEffect effect) {
+ protected ExileCardsFromTopOfLibraryTargetEffect(final ExileCardsFromTopOfLibraryTargetEffect effect) {
super(effect);
this.amount = effect.amount;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileFromZoneTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileFromZoneTargetEffect.java
index 9f30540539b..82037f02383 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/ExileFromZoneTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/ExileFromZoneTargetEffect.java
@@ -43,7 +43,7 @@ public class ExileFromZoneTargetEffect extends OneShotEffect {
this.withSource = withSource;
}
- public ExileFromZoneTargetEffect(final ExileFromZoneTargetEffect effect) {
+ protected ExileFromZoneTargetEffect(final ExileFromZoneTargetEffect effect) {
super(effect);
this.zone = effect.zone;
this.filter = effect.filter.copy();
diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileGraveyardAllPlayersEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileGraveyardAllPlayersEffect.java
index 2bd63877bb3..e1133b29195 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/ExileGraveyardAllPlayersEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/ExileGraveyardAllPlayersEffect.java
@@ -39,7 +39,7 @@ public class ExileGraveyardAllPlayersEffect extends OneShotEffect {
+ "graveyards";
}
- public ExileGraveyardAllPlayersEffect(final ExileGraveyardAllPlayersEffect effect) {
+ protected ExileGraveyardAllPlayersEffect(final ExileGraveyardAllPlayersEffect effect) {
super(effect);
this.filter = effect.filter;
this.targetController = effect.targetController;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileSourceEffect.java
index 0410d7af388..3e53601fb1a 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/ExileSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/ExileSourceEffect.java
@@ -2,6 +2,7 @@
package mage.abilities.effects.common;
import java.util.UUID;
+
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
@@ -13,7 +14,6 @@ import mage.players.Player;
import mage.util.CardUtil;
/**
- *
* @author BetaSteward_at_googlemail.com
*/
public class ExileSourceEffect extends OneShotEffect {
@@ -25,10 +25,9 @@ public class ExileSourceEffect extends OneShotEffect {
}
/**
- *
* @param toUniqueExileZone moves the card to a source object dependant
- * unique exile zone, so another effect of the same source object (e.g.
- * Deadeye Navigator) can identify the card
+ * unique exile zone, so another effect of the same source object (e.g.
+ * Deadeye Navigator) can identify the card
*/
public ExileSourceEffect(boolean toUniqueExileZone) {
super(Outcome.Exile);
@@ -36,7 +35,7 @@ public class ExileSourceEffect extends OneShotEffect {
this.toUniqueExileZone = toUniqueExileZone;
}
- public ExileSourceEffect(final ExileSourceEffect effect) {
+ protected ExileSourceEffect(final ExileSourceEffect effect) {
super(effect);
this.toUniqueExileZone = effect.toUniqueExileZone;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileSourceUnlessPaysEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileSourceUnlessPaysEffect.java
index ff0ec0a2931..4965b265ffc 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/ExileSourceUnlessPaysEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/ExileSourceUnlessPaysEffect.java
@@ -2,6 +2,7 @@
package mage.abilities.effects.common;
import java.util.Locale;
+
import mage.abilities.Ability;
import mage.abilities.Mode;
import mage.abilities.costs.Cost;
@@ -13,7 +14,6 @@ import mage.players.Player;
import mage.util.CardUtil;
/**
- *
* @author fireshoes
*/
public class ExileSourceUnlessPaysEffect extends OneShotEffect {
@@ -25,7 +25,7 @@ public class ExileSourceUnlessPaysEffect extends OneShotEffect {
this.cost = cost;
}
- public ExileSourceUnlessPaysEffect(final ExileSourceUnlessPaysEffect effect) {
+ protected ExileSourceUnlessPaysEffect(final ExileSourceUnlessPaysEffect effect) {
super(effect);
this.cost = effect.cost.copy();
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileTargetCardCopyAndCastEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileTargetCardCopyAndCastEffect.java
index 0791dbd47a8..ba07134793b 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/ExileTargetCardCopyAndCastEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/ExileTargetCardCopyAndCastEffect.java
@@ -24,6 +24,7 @@ public class ExileTargetCardCopyAndCastEffect extends OneShotEffect {
/**
* NOTE: You must supply your own effect text
+ *
* @param noMana Whether the copy can be cast without paying its mana cost
* @param optional Whether the casting of the copy is optional (otherwise it must be cast if possible)
*/
@@ -34,7 +35,7 @@ public class ExileTargetCardCopyAndCastEffect extends OneShotEffect {
this.noMana = noMana;
}
- public ExileTargetCardCopyAndCastEffect(final ExileTargetCardCopyAndCastEffect effect) {
+ protected ExileTargetCardCopyAndCastEffect(final ExileTargetCardCopyAndCastEffect effect) {
super(effect);
this.optional = effect.optional;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileTargetEffect.java
index 23a013e4583..ef0ddbbe66c 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/ExileTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/ExileTargetEffect.java
@@ -56,7 +56,7 @@ public class ExileTargetEffect extends OneShotEffect {
this.onlyFromZone = onlyFromZone;
}
- public ExileTargetEffect(final ExileTargetEffect effect) {
+ protected ExileTargetEffect(final ExileTargetEffect effect) {
super(effect);
this.exileZone = effect.exileZone;
this.exileId = effect.exileId;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileTargetForSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileTargetForSourceEffect.java
index b6ea3543b17..d684d973645 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/ExileTargetForSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/ExileTargetForSourceEffect.java
@@ -37,7 +37,7 @@ public class ExileTargetForSourceEffect extends OneShotEffect {
super(Outcome.Exile);
}
- public ExileTargetForSourceEffect(final ExileTargetForSourceEffect effect) {
+ protected ExileTargetForSourceEffect(final ExileTargetForSourceEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileTargetIfDiesEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileTargetIfDiesEffect.java
index d73cff9fde7..b44baf32385 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/ExileTargetIfDiesEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/ExileTargetIfDiesEffect.java
@@ -23,7 +23,7 @@ public class ExileTargetIfDiesEffect extends OneShotEffect {
this.staticText = "If that " + targetName + " would die this turn, exile it instead";
}
- public ExileTargetIfDiesEffect(final ExileTargetIfDiesEffect effect) {
+ protected ExileTargetIfDiesEffect(final ExileTargetIfDiesEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileUntilSourceLeavesEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileUntilSourceLeavesEffect.java
index fa15bbe4c86..95a3a8bbb8c 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/ExileUntilSourceLeavesEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/ExileUntilSourceLeavesEffect.java
@@ -12,7 +12,6 @@ import mage.game.permanent.Permanent;
import mage.util.CardUtil;
/**
- *
* @author Styxo
*/
public class ExileUntilSourceLeavesEffect extends OneShotEffect {
@@ -29,6 +28,7 @@ public class ExileUntilSourceLeavesEffect extends OneShotEffect {
/**
* Exiles target(s) until source leaves battlefield
+ *
* @param returnToZone The zone to which the exiled card will be returned when source leaves
*/
public ExileUntilSourceLeavesEffect(Zone returnToZone) {
@@ -36,7 +36,7 @@ public class ExileUntilSourceLeavesEffect extends OneShotEffect {
this.returnToZone = returnToZone;
}
- public ExileUntilSourceLeavesEffect(final ExileUntilSourceLeavesEffect effect) {
+ protected ExileUntilSourceLeavesEffect(final ExileUntilSourceLeavesEffect effect) {
super(effect);
this.returnToZone = effect.returnToZone;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/FightTargetSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/FightTargetSourceEffect.java
index ad0858af482..1503bec8492 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/FightTargetSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/FightTargetSourceEffect.java
@@ -18,7 +18,7 @@ public class FightTargetSourceEffect extends OneShotEffect {
super(Outcome.Damage);
}
- public FightTargetSourceEffect(final FightTargetSourceEffect effect) {
+ protected FightTargetSourceEffect(final FightTargetSourceEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/FightTargetsEffect.java b/Mage/src/main/java/mage/abilities/effects/common/FightTargetsEffect.java
index 51dd7545109..634161bb8a0 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/FightTargetsEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/FightTargetsEffect.java
@@ -27,7 +27,7 @@ public class FightTargetsEffect extends OneShotEffect {
this.showEffectHint = showEffectHint;
}
- public FightTargetsEffect(final FightTargetsEffect effect) {
+ protected FightTargetsEffect(final FightTargetsEffect effect) {
super(effect);
this.showEffectHint = effect.showEffectHint;
}
@@ -81,11 +81,11 @@ public class FightTargetsEffect extends OneShotEffect {
if (staticText != null && !staticText.isEmpty()) {
return staticText;
}
- Target target=mode.getTargets().get(1);
- StringBuilder sb=new StringBuilder("target ");
+ Target target = mode.getTargets().get(1);
+ StringBuilder sb = new StringBuilder("target ");
sb.append(mode.getTargets().get(0).getTargetName());
sb.append(" fights ");
- if(!target.getTargetName().contains("other")){
+ if (!target.getTargetName().contains("other")) {
sb.append("target ");
}
sb.append(target.getTargetName());
diff --git a/Mage/src/main/java/mage/abilities/effects/common/FlipCoinEffect.java b/Mage/src/main/java/mage/abilities/effects/common/FlipCoinEffect.java
index ec30a8ed804..d289b93d621 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/FlipCoinEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/FlipCoinEffect.java
@@ -38,7 +38,7 @@ public class FlipCoinEffect extends OneShotEffect {
addEffectLost(effectLost);
}
- public FlipCoinEffect(final FlipCoinEffect effect) {
+ protected FlipCoinEffect(final FlipCoinEffect effect) {
super(effect);
this.executingEffectsWon = effect.executingEffectsWon.copy();
this.executingEffectsLost = effect.executingEffectsLost.copy();
diff --git a/Mage/src/main/java/mage/abilities/effects/common/FlipSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/FlipSourceEffect.java
index 697a83b2a96..b5a8f43facb 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/FlipSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/FlipSourceEffect.java
@@ -24,7 +24,7 @@ public class FlipSourceEffect extends OneShotEffect {
staticText = "flip it";
}
- public FlipSourceEffect(final FlipSourceEffect effect) {
+ protected FlipSourceEffect(final FlipSourceEffect effect) {
super(effect);
this.flipToken = effect.flipToken;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/FlipUntilLoseEffect.java b/Mage/src/main/java/mage/abilities/effects/common/FlipUntilLoseEffect.java
index 6d1abe14fdd..34486c007b8 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/FlipUntilLoseEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/FlipUntilLoseEffect.java
@@ -8,7 +8,6 @@ import mage.game.Game;
import mage.players.Player;
/**
- *
* @author TheElk801
*/
public class FlipUntilLoseEffect extends OneShotEffect {
@@ -18,7 +17,7 @@ public class FlipUntilLoseEffect extends OneShotEffect {
this.staticText = "flip a coin until you lose a flip";
}
- public FlipUntilLoseEffect(final FlipUntilLoseEffect effect) {
+ protected FlipUntilLoseEffect(final FlipUntilLoseEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/GainActivatedAbilitiesOfTopCardEffect.java b/Mage/src/main/java/mage/abilities/effects/common/GainActivatedAbilitiesOfTopCardEffect.java
index decdcd9ac5e..d368ffc5e07 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/GainActivatedAbilitiesOfTopCardEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/GainActivatedAbilitiesOfTopCardEffect.java
@@ -23,7 +23,7 @@ public class GainActivatedAbilitiesOfTopCardEffect extends ContinuousEffectImpl
this.filter = filter;
}
- public GainActivatedAbilitiesOfTopCardEffect(final GainActivatedAbilitiesOfTopCardEffect effect) {
+ protected GainActivatedAbilitiesOfTopCardEffect(final GainActivatedAbilitiesOfTopCardEffect effect) {
super(effect);
this.filter = effect.filter;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/GainLifeEffect.java b/Mage/src/main/java/mage/abilities/effects/common/GainLifeEffect.java
index 9ec9404ed87..67307e1916b 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/GainLifeEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/GainLifeEffect.java
@@ -33,7 +33,7 @@ public class GainLifeEffect extends OneShotEffect {
staticText = rule;
}
- public GainLifeEffect(final GainLifeEffect effect) {
+ protected GainLifeEffect(final GainLifeEffect effect) {
super(effect);
this.life = effect.life.copy();
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/GainLifeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/GainLifeTargetEffect.java
index 25579ab5b68..36ff307dd03 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/GainLifeTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/GainLifeTargetEffect.java
@@ -1,6 +1,7 @@
package mage.abilities.effects.common;
import java.util.UUID;
+
import mage.abilities.Ability;
import mage.abilities.Mode;
import mage.abilities.dynamicvalue.DynamicValue;
@@ -11,7 +12,6 @@ import mage.game.Game;
import mage.players.Player;
/**
- *
* @author BetaSteward_at_googlemail.com
*/
public class GainLifeTargetEffect extends OneShotEffect {
@@ -27,7 +27,7 @@ public class GainLifeTargetEffect extends OneShotEffect {
this.life = life;
}
- public GainLifeTargetEffect(final GainLifeTargetEffect effect) {
+ protected GainLifeTargetEffect(final GainLifeTargetEffect effect) {
super(effect);
this.life = effect.life;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/GetEmblemEffect.java b/Mage/src/main/java/mage/abilities/effects/common/GetEmblemEffect.java
index 8119575b0bd..3ff87f971ca 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/GetEmblemEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/GetEmblemEffect.java
@@ -23,7 +23,7 @@ public class GetEmblemEffect extends OneShotEffect {
this.staticText = getText();
}
- public GetEmblemEffect(final GetEmblemEffect effect) {
+ protected GetEmblemEffect(final GetEmblemEffect effect) {
super(effect);
this.emblem = effect.emblem;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/GetEmblemTargetPlayerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/GetEmblemTargetPlayerEffect.java
index 2c9dce9eff8..58eace1dd16 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/GetEmblemTargetPlayerEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/GetEmblemTargetPlayerEffect.java
@@ -24,7 +24,7 @@ public class GetEmblemTargetPlayerEffect extends OneShotEffect {
}
- public GetEmblemTargetPlayerEffect(final GetEmblemTargetPlayerEffect effect) {
+ protected GetEmblemTargetPlayerEffect(final GetEmblemTargetPlayerEffect effect) {
super(effect);
this.emblem = effect.emblem;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/HideawayPlayEffect.java b/Mage/src/main/java/mage/abilities/effects/common/HideawayPlayEffect.java
index c9232b617cc..81389a98898 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/HideawayPlayEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/HideawayPlayEffect.java
@@ -22,7 +22,7 @@ public class HideawayPlayEffect extends OneShotEffect {
staticText = "you may play the exiled card without paying its mana cost";
}
- public HideawayPlayEffect(final HideawayPlayEffect effect) {
+ protected HideawayPlayEffect(final HideawayPlayEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/ImprintTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ImprintTargetEffect.java
index d3b3681f2fa..3b9ad5cb2d0 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/ImprintTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/ImprintTargetEffect.java
@@ -11,7 +11,6 @@ import mage.game.Game;
import mage.game.permanent.Permanent;
/**
- *
* @author noxx
*/
public class ImprintTargetEffect extends OneShotEffect {
@@ -20,7 +19,7 @@ public class ImprintTargetEffect extends OneShotEffect {
super(Outcome.Neutral);
}
- public ImprintTargetEffect(final ImprintTargetEffect effect) {
+ protected ImprintTargetEffect(final ImprintTargetEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/InfoEffect.java b/Mage/src/main/java/mage/abilities/effects/common/InfoEffect.java
index d7150029d97..c1b5ab78f8f 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/InfoEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/InfoEffect.java
@@ -24,7 +24,7 @@ public class InfoEffect extends OneShotEffect {
this.staticText = text;
}
- public InfoEffect(final InfoEffect effect) {
+ protected InfoEffect(final InfoEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/LivingDeathEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LivingDeathEffect.java
index 2b346b9a835..03f5de3ccb5 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/LivingDeathEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/LivingDeathEffect.java
@@ -20,7 +20,7 @@ public class LivingDeathEffect extends OneShotEffect {
this.staticText = "Each player exiles all creature cards from their graveyard, then sacrifices all creatures they control, then puts all cards they exiled this way onto the battlefield";
}
- public LivingDeathEffect(final LivingDeathEffect effect) {
+ protected LivingDeathEffect(final LivingDeathEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/LookAtTargetPlayerHandEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LookAtTargetPlayerHandEffect.java
index ccc21d321ef..4e63bf28513 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/LookAtTargetPlayerHandEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/LookAtTargetPlayerHandEffect.java
@@ -9,7 +9,6 @@ import mage.game.Game;
import mage.players.Player;
/**
- *
* @author Quercitron
*/
public class LookAtTargetPlayerHandEffect extends OneShotEffect {
@@ -19,7 +18,7 @@ public class LookAtTargetPlayerHandEffect extends OneShotEffect {
this.staticText = "look at target player's hand";
}
- public LookAtTargetPlayerHandEffect(final LookAtTargetPlayerHandEffect effect) {
+ protected LookAtTargetPlayerHandEffect(final LookAtTargetPlayerHandEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java
index 343eff44af2..8a3244bfe9c 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java
@@ -108,7 +108,7 @@ public class LookLibraryAndPickControllerEffect extends LookLibraryControllerEff
this.upTo = (numberToPick > 1);
}
- public LookLibraryAndPickControllerEffect(final LookLibraryAndPickControllerEffect effect) {
+ protected LookLibraryAndPickControllerEffect(final LookLibraryAndPickControllerEffect effect) {
super(effect);
this.numberToPick = effect.numberToPick;
this.putPickedCards = effect.putPickedCards;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/LookLibraryControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LookLibraryControllerEffect.java
index 7144a064bdf..c6db2ed40df 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/LookLibraryControllerEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/LookLibraryControllerEffect.java
@@ -16,7 +16,6 @@ import mage.players.Player;
import mage.util.CardUtil;
/**
- *
* @author LevelX, awjackson
*/
public class LookLibraryControllerEffect extends OneShotEffect {
@@ -44,7 +43,7 @@ public class LookLibraryControllerEffect extends OneShotEffect {
this.revealCards = false;
}
- public LookLibraryControllerEffect(final LookLibraryControllerEffect effect) {
+ protected LookLibraryControllerEffect(final LookLibraryControllerEffect effect) {
super(effect);
this.numberOfCards = effect.numberOfCards.copy();
this.putLookedCards = effect.putLookedCards;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/LookLibraryTopCardTargetPlayerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LookLibraryTopCardTargetPlayerEffect.java
index 9c60d04ed4b..d70ffb0c476 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/LookLibraryTopCardTargetPlayerEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/LookLibraryTopCardTargetPlayerEffect.java
@@ -14,7 +14,6 @@ import mage.players.Player;
import mage.util.CardUtil;
/**
- *
* @author LevelX2
*/
public class LookLibraryTopCardTargetPlayerEffect extends OneShotEffect {
@@ -51,7 +50,7 @@ public class LookLibraryTopCardTargetPlayerEffect extends OneShotEffect {
this(1);
}
- public LookLibraryTopCardTargetPlayerEffect(final LookLibraryTopCardTargetPlayerEffect effect) {
+ protected LookLibraryTopCardTargetPlayerEffect(final LookLibraryTopCardTargetPlayerEffect effect) {
super(effect);
amount = effect.amount;
putToGraveyard = effect.putToGraveyard;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/LoseControlOnOtherPlayersControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseControlOnOtherPlayersControllerEffect.java
index 01bb92c2ee4..1e1b9bbc81e 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/LoseControlOnOtherPlayersControllerEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/LoseControlOnOtherPlayersControllerEffect.java
@@ -9,7 +9,6 @@ import mage.game.Game;
import mage.players.Player;
/**
- *
* @author nantuko
*/
public class LoseControlOnOtherPlayersControllerEffect extends OneShotEffect {
@@ -19,7 +18,7 @@ public class LoseControlOnOtherPlayersControllerEffect extends OneShotEffect {
staticText = controllingPlayerName + " lost control over " + controlledPlayerName;
}
- public LoseControlOnOtherPlayersControllerEffect(final LoseControlOnOtherPlayersControllerEffect effect) {
+ protected LoseControlOnOtherPlayersControllerEffect(final LoseControlOnOtherPlayersControllerEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/LoseGameSourceControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseGameSourceControllerEffect.java
index 8101b09a75b..1356b62f0f7 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/LoseGameSourceControllerEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/LoseGameSourceControllerEffect.java
@@ -9,7 +9,6 @@ import mage.game.Game;
import mage.players.Player;
/**
- *
* @author LevelX2
*/
@@ -20,7 +19,7 @@ public class LoseGameSourceControllerEffect extends OneShotEffect {
this.staticText = "you lose the game";
}
- public LoseGameSourceControllerEffect(final LoseGameSourceControllerEffect effect) {
+ protected LoseGameSourceControllerEffect(final LoseGameSourceControllerEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/LoseGameTargetPlayerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseGameTargetPlayerEffect.java
index ee1305c1c23..1740589aca6 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/LoseGameTargetPlayerEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/LoseGameTargetPlayerEffect.java
@@ -9,7 +9,6 @@ import mage.game.Game;
import mage.players.Player;
/**
- *
* @author LevelX2
*/
@@ -20,7 +19,7 @@ public class LoseGameTargetPlayerEffect extends OneShotEffect {
this.staticText = "that player loses the game";
}
- public LoseGameTargetPlayerEffect(final LoseGameTargetPlayerEffect effect) {
+ protected LoseGameTargetPlayerEffect(final LoseGameTargetPlayerEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/LoseHalfLifeEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseHalfLifeEffect.java
index 0b98930cae6..c8469780dae 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/LoseHalfLifeEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/LoseHalfLifeEffect.java
@@ -16,7 +16,7 @@ public class LoseHalfLifeEffect extends OneShotEffect {
staticText = "you lose half your life, rounded up";
}
- public LoseHalfLifeEffect(final LoseHalfLifeEffect effect) {
+ protected LoseHalfLifeEffect(final LoseHalfLifeEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/LoseHalfLifeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseHalfLifeTargetEffect.java
index 010f30b2576..dfcb24b0f95 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/LoseHalfLifeTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/LoseHalfLifeTargetEffect.java
@@ -8,7 +8,6 @@ import mage.game.Game;
import mage.players.Player;
/**
- *
* @author Styxo
*/
public class LoseHalfLifeTargetEffect extends OneShotEffect {
@@ -18,7 +17,7 @@ public class LoseHalfLifeTargetEffect extends OneShotEffect {
staticText = "that player loses half their life, rounded up";
}
- public LoseHalfLifeTargetEffect(final LoseHalfLifeTargetEffect effect) {
+ protected LoseHalfLifeTargetEffect(final LoseHalfLifeTargetEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/LoseLifeAllPlayersEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeAllPlayersEffect.java
index f96a7c188aa..e1bc94e586a 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/LoseLifeAllPlayersEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeAllPlayersEffect.java
@@ -12,7 +12,6 @@ import mage.game.Game;
import mage.players.Player;
/**
- *
* @author BetaSteward_at_googlemail.com
*/
public class LoseLifeAllPlayersEffect extends OneShotEffect {
@@ -22,27 +21,27 @@ public class LoseLifeAllPlayersEffect extends OneShotEffect {
public LoseLifeAllPlayersEffect(int amount) {
this(StaticValue.get(amount));
}
-
+
public LoseLifeAllPlayersEffect(DynamicValue amount) {
super(Outcome.Damage);
this.amount = amount;
staticText = setText();
}
-
+
public LoseLifeAllPlayersEffect(DynamicValue amount, String text) {
super(Outcome.Damage);
this.amount = amount;
staticText = text;
}
- public LoseLifeAllPlayersEffect(final LoseLifeAllPlayersEffect effect) {
+ protected LoseLifeAllPlayersEffect(final LoseLifeAllPlayersEffect effect) {
super(effect);
this.amount = effect.amount;
}
@Override
public boolean apply(Game game, Ability source) {
- for (UUID playerId: game.getState().getPlayersInRange(source.getControllerId(), game)) {
+ for (UUID playerId : game.getState().getPlayersInRange(source.getControllerId(), game)) {
Player player = game.getPlayer(playerId);
if (player != null) {
player.loseLife(amount.calculate(game, source, this), game, source, false);
@@ -55,7 +54,7 @@ public class LoseLifeAllPlayersEffect extends OneShotEffect {
public LoseLifeAllPlayersEffect copy() {
return new LoseLifeAllPlayersEffect(this);
}
-
+
private String setText() {
StringBuilder sb = new StringBuilder("each player loses ");
sb.append(amount);
diff --git a/Mage/src/main/java/mage/abilities/effects/common/LoseLifeControllerAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeControllerAttachedEffect.java
index 4ffcbdbdc81..e1b888b7bf2 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/LoseLifeControllerAttachedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeControllerAttachedEffect.java
@@ -26,7 +26,7 @@ public class LoseLifeControllerAttachedEffect extends OneShotEffect {
setText();
}
- public LoseLifeControllerAttachedEffect(final LoseLifeControllerAttachedEffect effect) {
+ protected LoseLifeControllerAttachedEffect(final LoseLifeControllerAttachedEffect effect) {
super(effect);
this.amount = effect.amount.copy();
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/LoseLifeDefendingPlayerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeDefendingPlayerEffect.java
index 8e3451e4fec..0a876e68e54 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/LoseLifeDefendingPlayerEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeDefendingPlayerEffect.java
@@ -19,10 +19,9 @@ public class LoseLifeDefendingPlayerEffect extends OneShotEffect {
private boolean attackerIsSource;
/**
- *
* @param amount
* @param attackerIsSource true if the source.getSourceId() contains the
- * attacker false if attacker has to be taken from targetPointer
+ * attacker false if attacker has to be taken from targetPointer
*/
public LoseLifeDefendingPlayerEffect(int amount, boolean attackerIsSource) {
this(StaticValue.get(amount), attackerIsSource);
@@ -34,7 +33,7 @@ public class LoseLifeDefendingPlayerEffect extends OneShotEffect {
this.attackerIsSource = attackerIsSource;
}
- public LoseLifeDefendingPlayerEffect(final LoseLifeDefendingPlayerEffect effect) {
+ protected LoseLifeDefendingPlayerEffect(final LoseLifeDefendingPlayerEffect effect) {
super(effect);
this.amount = effect.amount.copy();
this.attackerIsSource = effect.attackerIsSource;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/LoseLifeOpponentsEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeOpponentsEffect.java
index 292f2e6feec..5eac5ea38f3 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/LoseLifeOpponentsEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeOpponentsEffect.java
@@ -29,7 +29,7 @@ public class LoseLifeOpponentsEffect extends OneShotEffect {
staticText = generateStaticText();
}
- public LoseLifeOpponentsEffect(final LoseLifeOpponentsEffect effect) {
+ protected LoseLifeOpponentsEffect(final LoseLifeOpponentsEffect effect) {
super(effect);
this.amount = effect.amount;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/LoseLifePermanentControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseLifePermanentControllerEffect.java
index b6e1f5be6f8..f77019381f3 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/LoseLifePermanentControllerEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/LoseLifePermanentControllerEffect.java
@@ -10,10 +10,10 @@ import mage.game.permanent.Permanent;
import mage.players.Player;
-
/**
* This effect applies to the permanent's controller which originated the ability, but not to the controller of that
* source ability.
+ *
* @author jesusjbr
*/
public class LoseLifePermanentControllerEffect extends OneShotEffect {
@@ -30,7 +30,7 @@ public class LoseLifePermanentControllerEffect extends OneShotEffect {
setText();
}
- public LoseLifePermanentControllerEffect(final LoseLifePermanentControllerEffect effect) {
+ protected LoseLifePermanentControllerEffect(final LoseLifePermanentControllerEffect effect) {
super(effect);
this.amount = effect.amount.copy();
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/LoseLifeSourceControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeSourceControllerEffect.java
index 98d89a10adf..b3e54ac0a94 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/LoseLifeSourceControllerEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeSourceControllerEffect.java
@@ -11,7 +11,6 @@ import mage.game.Game;
import mage.players.Player;
/**
- *
* @author BetaSteward_at_googlemail.com
*/
public class LoseLifeSourceControllerEffect extends OneShotEffect {
@@ -28,7 +27,7 @@ public class LoseLifeSourceControllerEffect extends OneShotEffect {
setText();
}
- public LoseLifeSourceControllerEffect(final LoseLifeSourceControllerEffect effect) {
+ protected LoseLifeSourceControllerEffect(final LoseLifeSourceControllerEffect effect) {
super(effect);
this.amount = effect.amount.copy();
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/LoseLifeTargetControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeTargetControllerEffect.java
index e0d2a94c0ad..eb1b093969b 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/LoseLifeTargetControllerEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeTargetControllerEffect.java
@@ -14,7 +14,6 @@ import mage.game.stack.Spell;
import mage.players.Player;
/**
- *
* @author North
*/
public class LoseLifeTargetControllerEffect extends OneShotEffect {
@@ -31,7 +30,7 @@ public class LoseLifeTargetControllerEffect extends OneShotEffect {
staticText = "Its controller loses " + amount + " life";
}
- public LoseLifeTargetControllerEffect(final LoseLifeTargetControllerEffect effect) {
+ protected LoseLifeTargetControllerEffect(final LoseLifeTargetControllerEffect effect) {
super(effect);
this.amount = effect.amount.copy();
}
@@ -46,25 +45,25 @@ public class LoseLifeTargetControllerEffect extends OneShotEffect {
MageObject targetCard = targetPointer.getFirstTargetPermanentOrLKI(game, source);
// if target is a countered spell
- if ( targetCard == null ) {
+ if (targetCard == null) {
targetCard = game.getLastKnownInformation(targetPointer.getFirst(game, source), Zone.STACK);
}
- if ( targetCard != null ) {
+ if (targetCard != null) {
Player controller = null;
//Handles interaction with permanents that were on the battlefield.
- if ( targetCard instanceof Permanent ) {
- Permanent targetPermanent = (Permanent)targetCard;
+ if (targetCard instanceof Permanent) {
+ Permanent targetPermanent = (Permanent) targetCard;
controller = game.getPlayer(targetPermanent.getControllerId());
}
//Handles interaction with spells that were on the stack.
- else if ( targetCard instanceof Spell ) {
- Spell targetSpell = (Spell)targetCard;
+ else if (targetCard instanceof Spell) {
+ Spell targetSpell = (Spell) targetCard;
controller = game.getPlayer(targetSpell.getControllerId());
}
- if ( controller != null ) {
+ if (controller != null) {
controller.loseLife(amount.calculate(game, source, this), game, source, false);
return true;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/LoseLifeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeTargetEffect.java
index 718635249bd..cc4d078befd 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/LoseLifeTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeTargetEffect.java
@@ -1,6 +1,7 @@
package mage.abilities.effects.common;
import java.util.UUID;
+
import mage.abilities.Ability;
import mage.abilities.Mode;
import mage.abilities.dynamicvalue.DynamicValue;
@@ -11,7 +12,6 @@ import mage.game.Game;
import mage.players.Player;
/**
- *
* @author BetaSteward_at_googlemail.com
*/
public class LoseLifeTargetEffect extends OneShotEffect {
@@ -27,7 +27,7 @@ public class LoseLifeTargetEffect extends OneShotEffect {
this.amount = amount;
}
- public LoseLifeTargetEffect(final LoseLifeTargetEffect effect) {
+ protected LoseLifeTargetEffect(final LoseLifeTargetEffect effect) {
super(effect);
this.amount = effect.amount.copy();
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/MayTapOrUntapTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/MayTapOrUntapTargetEffect.java
index 4ff98626cd5..5595d0ae0de 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/MayTapOrUntapTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/MayTapOrUntapTargetEffect.java
@@ -17,7 +17,7 @@ public class MayTapOrUntapTargetEffect extends OneShotEffect {
super(Outcome.AIDontUseIt);
}
- public MayTapOrUntapTargetEffect(final MayTapOrUntapTargetEffect effect) {
+ protected MayTapOrUntapTargetEffect(final MayTapOrUntapTargetEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/MeldEffect.java b/Mage/src/main/java/mage/abilities/effects/common/MeldEffect.java
index 79b9bd5e650..43336400b8f 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/MeldEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/MeldEffect.java
@@ -43,7 +43,7 @@ public class MeldEffect extends OneShotEffect {
this.attacking = attacking;
}
- public MeldEffect(final MeldEffect effect) {
+ protected MeldEffect(final MeldEffect effect) {
super(effect);
this.meldWithName = effect.meldWithName;
this.meldIntoName = effect.meldIntoName;
diff --git a/Mage/src/main/java/mage/abilities/effects/common/MillCardsTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/MillCardsTargetEffect.java
index 7ce8cb33db1..e6252f18a86 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/MillCardsTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/MillCardsTargetEffect.java
@@ -26,7 +26,7 @@ public class MillCardsTargetEffect extends OneShotEffect {
this.numberCards = numberCards;
}
- public MillCardsTargetEffect(final MillCardsTargetEffect effect) {
+ protected MillCardsTargetEffect(final MillCardsTargetEffect effect) {
super(effect);
this.numberCards = effect.numberCards;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/OpponentsCantCastChosenUntilNextTurnEffect.java b/Mage/src/main/java/mage/abilities/effects/common/OpponentsCantCastChosenUntilNextTurnEffect.java
index 5fed90bb224..b9411849ca3 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/OpponentsCantCastChosenUntilNextTurnEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/OpponentsCantCastChosenUntilNextTurnEffect.java
@@ -19,7 +19,7 @@ public class OpponentsCantCastChosenUntilNextTurnEffect extends ContinuousRuleMo
staticText = "Until your next turn, your opponents can't cast spells with the chosen name";
}
- public OpponentsCantCastChosenUntilNextTurnEffect(final OpponentsCantCastChosenUntilNextTurnEffect effect) {
+ protected OpponentsCantCastChosenUntilNextTurnEffect(final OpponentsCantCastChosenUntilNextTurnEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/PassEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PassEffect.java
index 6ffb908c433..73b2cdda80c 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/PassEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/PassEffect.java
@@ -9,7 +9,6 @@ import mage.game.Game;
import mage.players.Player;
/**
- *
* @author BetaSteward_at_googlemail.com
*/
public class PassEffect extends OneShotEffect {
@@ -18,7 +17,7 @@ public class PassEffect extends OneShotEffect {
super(Outcome.Neutral);
}
- public PassEffect(final PassEffect effect) {
+ protected PassEffect(final PassEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/PermanentsEnterBattlefieldTappedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PermanentsEnterBattlefieldTappedEffect.java
index 95eb1e993fd..18648fb0e31 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/PermanentsEnterBattlefieldTappedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/PermanentsEnterBattlefieldTappedEffect.java
@@ -27,7 +27,7 @@ public class PermanentsEnterBattlefieldTappedEffect extends ReplacementEffectImp
this.filter = filter;
}
- public PermanentsEnterBattlefieldTappedEffect(final PermanentsEnterBattlefieldTappedEffect effect) {
+ protected PermanentsEnterBattlefieldTappedEffect(final PermanentsEnterBattlefieldTappedEffect effect) {
super(effect);
this.filter = effect.filter;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/PhaseOutAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PhaseOutAllEffect.java
index a21ec943842..2a142b0fb94 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/PhaseOutAllEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/PhaseOutAllEffect.java
@@ -3,6 +3,7 @@ package mage.abilities.effects.common;
import java.util.List;
import java.util.UUID;
+
import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
import mage.constants.Outcome;
@@ -23,7 +24,7 @@ public class PhaseOutAllEffect extends OneShotEffect {
this.idList = idList;
}
- public PhaseOutAllEffect(final PhaseOutAllEffect effect) {
+ protected PhaseOutAllEffect(final PhaseOutAllEffect effect) {
super(effect);
this.idList = effect.idList;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/PhaseOutAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PhaseOutAttachedEffect.java
index d5c92552da5..ca4d540d768 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/PhaseOutAttachedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/PhaseOutAttachedEffect.java
@@ -8,7 +8,6 @@ import mage.game.Game;
import mage.game.permanent.Permanent;
/**
- *
* @author escplan9 (Derek Monturo - dmontur1 at gmail dot com)
*/
public class PhaseOutAttachedEffect extends OneShotEffect {
@@ -18,7 +17,7 @@ public class PhaseOutAttachedEffect extends OneShotEffect {
this.staticText = "Enchanted creature phases out";
}
- public PhaseOutAttachedEffect(final PhaseOutAttachedEffect effect) {
+ protected PhaseOutAttachedEffect(final PhaseOutAttachedEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/PhaseOutSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PhaseOutSourceEffect.java
index d1669ad7a0e..9f6b4cb03e0 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/PhaseOutSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/PhaseOutSourceEffect.java
@@ -7,7 +7,6 @@ import mage.game.Game;
import mage.game.permanent.Permanent;
/**
- *
* @author fireshoes
*/
public class PhaseOutSourceEffect extends OneShotEffect {
@@ -17,7 +16,7 @@ public class PhaseOutSourceEffect extends OneShotEffect {
this.staticText = "{this} phases out";
}
- public PhaseOutSourceEffect(final PhaseOutSourceEffect effect) {
+ protected PhaseOutSourceEffect(final PhaseOutSourceEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/PlayTargetWithoutPayingManaEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PlayTargetWithoutPayingManaEffect.java
index 6746d228afe..e19d58a1944 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/PlayTargetWithoutPayingManaEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/PlayTargetWithoutPayingManaEffect.java
@@ -12,7 +12,6 @@ import mage.players.Player;
import mage.target.Target;
/**
- *
* @author BetaSteward_at_googlemail.com
*/
public class PlayTargetWithoutPayingManaEffect extends OneShotEffect {
@@ -21,7 +20,7 @@ public class PlayTargetWithoutPayingManaEffect extends OneShotEffect {
super(Outcome.GainControl);
}
- public PlayTargetWithoutPayingManaEffect(final PlayTargetWithoutPayingManaEffect effect) {
+ protected PlayTargetWithoutPayingManaEffect(final PlayTargetWithoutPayingManaEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/PopulateEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PopulateEffect.java
index aa174fd5f59..2785ac5865e 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/PopulateEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/PopulateEffect.java
@@ -57,7 +57,7 @@ public class PopulateEffect extends OneShotEffect {
"(To populate, create a token that's a copy of a creature token you control.)";
}
- public PopulateEffect(final PopulateEffect effect) {
+ protected PopulateEffect(final PopulateEffect effect) {
super(effect);
this.tappedAndAttacking = effect.tappedAndAttacking;
this.addedTokenPermanents.addAll(effect.addedTokenPermanents);
diff --git a/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageByAllPermanentsEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageByAllPermanentsEffect.java
index 792187eb737..dcab38eb713 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageByAllPermanentsEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageByAllPermanentsEffect.java
@@ -11,7 +11,6 @@ import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
/**
- *
* @author LevelX
*/
public class PreventAllDamageByAllPermanentsEffect extends PreventionEffectImpl {
@@ -32,7 +31,7 @@ public class PreventAllDamageByAllPermanentsEffect extends PreventionEffectImpl
setText();
}
- public PreventAllDamageByAllPermanentsEffect(final PreventAllDamageByAllPermanentsEffect effect) {
+ protected PreventAllDamageByAllPermanentsEffect(final PreventAllDamageByAllPermanentsEffect effect) {
super(effect);
this.filter = effect.filter;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageByAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageByAttachedEffect.java
index 98ec306049a..fecf07c33a0 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageByAttachedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageByAttachedEffect.java
@@ -9,7 +9,6 @@ import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
/**
- *
* @author LevelX2
*/
public class PreventAllDamageByAttachedEffect extends PreventionEffectImpl {
@@ -22,7 +21,7 @@ public class PreventAllDamageByAttachedEffect extends PreventionEffectImpl {
staticText = setText();
}
- public PreventAllDamageByAttachedEffect(final PreventAllDamageByAttachedEffect effect) {
+ protected PreventAllDamageByAttachedEffect(final PreventAllDamageByAttachedEffect effect) {
super(effect);
this.attachedDescription = effect.attachedDescription;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageFromChosenSourceToYouEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageFromChosenSourceToYouEffect.java
index fc4ed76b548..4228b047194 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageFromChosenSourceToYouEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageFromChosenSourceToYouEffect.java
@@ -11,7 +11,6 @@ import mage.game.events.GameEvent;
import mage.target.TargetSource;
/**
- *
* @author LevelX2
*/
public class PreventAllDamageFromChosenSourceToYouEffect extends PreventionEffectImpl {
@@ -32,7 +31,7 @@ public class PreventAllDamageFromChosenSourceToYouEffect extends PreventionEffec
this.staticText = setText();
}
- public PreventAllDamageFromChosenSourceToYouEffect(final PreventAllDamageFromChosenSourceToYouEffect effect) {
+ protected PreventAllDamageFromChosenSourceToYouEffect(final PreventAllDamageFromChosenSourceToYouEffect effect) {
super(effect);
this.targetSource = effect.targetSource.copy();
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToAllEffect.java
index e67820c7531..14c6e1cfc8d 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToAllEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToAllEffect.java
@@ -45,7 +45,7 @@ public class PreventAllDamageToAllEffect extends PreventionEffectImpl {
+ (duration == Duration.EndOfTurn ? "this turn" : duration.toString());
}
- public PreventAllDamageToAllEffect(final PreventAllDamageToAllEffect effect) {
+ protected PreventAllDamageToAllEffect(final PreventAllDamageToAllEffect effect) {
super(effect);
this.filter = effect.filter.copy();
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToAndByAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToAndByAttachedEffect.java
index 15a999d6f58..32c9601c560 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToAndByAttachedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToAndByAttachedEffect.java
@@ -9,20 +9,19 @@ import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
/**
- *
* @author Quercitron
*/
public class PreventAllDamageToAndByAttachedEffect extends PreventionEffectImpl {
private final String attachedDescription;
-
+
public PreventAllDamageToAndByAttachedEffect(Duration duration, String attachedDescription, boolean onlyCombat) {
super(duration, Integer.MAX_VALUE, onlyCombat);
this.attachedDescription = attachedDescription;
this.staticText = setText();
}
- public PreventAllDamageToAndByAttachedEffect(final PreventAllDamageToAndByAttachedEffect effect) {
+ protected PreventAllDamageToAndByAttachedEffect(final PreventAllDamageToAndByAttachedEffect effect) {
super(effect);
this.attachedDescription = effect.attachedDescription;
}
@@ -54,5 +53,5 @@ public class PreventAllDamageToAndByAttachedEffect extends PreventionEffectImpl
sb.append(attachedDescription);
return sb.toString();
}
-
+
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToPlayersEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToPlayersEffect.java
index 56fe441c809..e9dfad405e8 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToPlayersEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToPlayersEffect.java
@@ -9,7 +9,6 @@ import mage.game.events.GameEvent;
import mage.players.Player;
/**
- *
* @author LevelX2
*/
public class PreventAllDamageToPlayersEffect extends PreventionEffectImpl {
@@ -19,7 +18,7 @@ public class PreventAllDamageToPlayersEffect extends PreventionEffectImpl {
staticText = setText();
}
- public PreventAllDamageToPlayersEffect(final PreventAllDamageToPlayersEffect effect) {
+ protected PreventAllDamageToPlayersEffect(final PreventAllDamageToPlayersEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToSourceByPermanentsEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToSourceByPermanentsEffect.java
index 98ebc280801..c4a1489ca10 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToSourceByPermanentsEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToSourceByPermanentsEffect.java
@@ -7,7 +7,6 @@ import mage.game.Game;
import mage.game.events.GameEvent;
/**
- *
* @author awjackson
*/
public class PreventAllDamageToSourceByPermanentsEffect extends PreventAllDamageByAllPermanentsEffect {
@@ -25,7 +24,7 @@ public class PreventAllDamageToSourceByPermanentsEffect extends PreventAllDamage
setText();
}
- public PreventAllDamageToSourceByPermanentsEffect(final PreventAllDamageToSourceByPermanentsEffect effect) {
+ protected PreventAllDamageToSourceByPermanentsEffect(final PreventAllDamageToSourceByPermanentsEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToSourceEffect.java
index 068c01df90d..735efd1ac5f 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToSourceEffect.java
@@ -7,7 +7,6 @@ import mage.game.Game;
import mage.game.events.GameEvent;
/**
- *
* @author BetaSteward_at_googlemail.com
*/
public class PreventAllDamageToSourceEffect extends PreventionEffectImpl {
@@ -21,7 +20,7 @@ public class PreventAllDamageToSourceEffect extends PreventionEffectImpl {
}
}
- public PreventAllDamageToSourceEffect(final PreventAllDamageToSourceEffect effect) {
+ protected PreventAllDamageToSourceEffect(final PreventAllDamageToSourceEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/PreventCombatDamageBySourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventCombatDamageBySourceEffect.java
index 6f7abdc467b..da50c29dc5f 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/PreventCombatDamageBySourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/PreventCombatDamageBySourceEffect.java
@@ -16,7 +16,7 @@ public class PreventCombatDamageBySourceEffect extends PreventionEffectImpl {
staticText = "Prevent all combat damage that would be dealt by {this}" + duration.toString();
}
- public PreventCombatDamageBySourceEffect(final PreventCombatDamageBySourceEffect effect) {
+ protected PreventCombatDamageBySourceEffect(final PreventCombatDamageBySourceEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/PreventCombatDamageToSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventCombatDamageToSourceEffect.java
index a544a6fa829..31a934f5806 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/PreventCombatDamageToSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/PreventCombatDamageToSourceEffect.java
@@ -9,23 +9,22 @@ import mage.game.Game;
import mage.game.events.GameEvent;
/**
- *
* @author jeffwadsworth
*/
public class PreventCombatDamageToSourceEffect extends PreventionEffectImpl {
public PreventCombatDamageToSourceEffect(Duration duration) {
- super(duration, Integer.MAX_VALUE, true);
- staticText = "Prevent all combat damage that would be dealt to {this}" + duration.toString();
+ super(duration, Integer.MAX_VALUE, true);
+ staticText = "Prevent all combat damage that would be dealt to {this}" + duration.toString();
}
- public PreventCombatDamageToSourceEffect(final PreventCombatDamageToSourceEffect effect) {
- super(effect);
+ protected PreventCombatDamageToSourceEffect(final PreventCombatDamageToSourceEffect effect) {
+ super(effect);
}
@Override
public PreventCombatDamageToSourceEffect copy() {
- return new PreventCombatDamageToSourceEffect(this);
+ return new PreventCombatDamageToSourceEffect(this);
}
@Override
diff --git a/Mage/src/main/java/mage/abilities/effects/common/PreventDamageBySourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventDamageBySourceEffect.java
index 56409db455a..a2faf91e017 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/PreventDamageBySourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/PreventDamageBySourceEffect.java
@@ -13,7 +13,6 @@ import mage.game.events.GameEvent;
import mage.target.TargetSource;
/**
- *
* @author LevelX2
*/
@@ -35,7 +34,7 @@ public class PreventDamageBySourceEffect extends PreventionEffectImpl {
staticText = "Prevent all damage " + filterObject.getMessage() + " of your choice would deal this turn";
}
- public PreventDamageBySourceEffect(final PreventDamageBySourceEffect effect) {
+ protected PreventDamageBySourceEffect(final PreventDamageBySourceEffect effect) {
super(effect);
this.target = effect.target.copy();
this.mageObjectReference = effect.mageObjectReference;
@@ -49,7 +48,7 @@ public class PreventDamageBySourceEffect extends PreventionEffectImpl {
@Override
public void init(Ability source, Game game) {
this.target.choose(Outcome.PreventDamage, source.getControllerId(), source.getSourceId(), source, game);
- mageObjectReference = new MageObjectReference(target.getFirstTarget(), game);
+ mageObjectReference = new MageObjectReference(target.getFirstTarget(), game);
}
@Override
@@ -58,7 +57,7 @@ public class PreventDamageBySourceEffect extends PreventionEffectImpl {
MageObject mageObject = game.getObject(event.getSourceId());
if (mageObject != null && mageObjectReference.refersTo(mageObject, game)) {
return true;
- }
+ }
}
return false;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/PreventDamageByTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventDamageByTargetEffect.java
index efa78371155..1a69ef3a0d5 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/PreventDamageByTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/PreventDamageByTargetEffect.java
@@ -31,7 +31,7 @@ public class PreventDamageByTargetEffect extends PreventionEffectImpl {
super(duration, amount, onlyCombat);
}
- public PreventDamageByTargetEffect(final PreventDamageByTargetEffect effect) {
+ protected PreventDamageByTargetEffect(final PreventDamageByTargetEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToAttachedEffect.java
index 16679da06b7..a0a58f8d7d2 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToAttachedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToAttachedEffect.java
@@ -11,7 +11,6 @@ import mage.game.permanent.Permanent;
import mage.util.CardUtil;
/**
- *
* @author LevelX2
*/
public class PreventDamageToAttachedEffect extends PreventionEffectImpl {
@@ -28,7 +27,7 @@ public class PreventDamageToAttachedEffect extends PreventionEffectImpl {
staticText = setText();
}
- public PreventDamageToAttachedEffect(final PreventDamageToAttachedEffect effect) {
+ protected PreventDamageToAttachedEffect(final PreventDamageToAttachedEffect effect) {
super(effect);
this.attachmentType = effect.attachmentType;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToControllerEffect.java
index 424f8eb7a0e..ae8f87c7d43 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToControllerEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToControllerEffect.java
@@ -28,7 +28,7 @@ public class PreventDamageToControllerEffect extends PreventionEffectImpl {
staticText = setText();
}
- public PreventDamageToControllerEffect(final PreventDamageToControllerEffect effect) {
+ protected PreventDamageToControllerEffect(final PreventDamageToControllerEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToSourceEffect.java
index 42aba576626..87b634bbcd5 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToSourceEffect.java
@@ -9,7 +9,6 @@ import mage.game.Game;
import mage.game.events.GameEvent;
/**
- *
* @author Quercitron
*/
public class PreventDamageToSourceEffect extends PreventionEffectImpl {
@@ -18,7 +17,7 @@ public class PreventDamageToSourceEffect extends PreventionEffectImpl {
super(duration, amountToPrevent, false);
}
- public PreventDamageToSourceEffect(final PreventDamageToSourceEffect effect) {
+ protected PreventDamageToSourceEffect(final PreventDamageToSourceEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToTargetEffect.java
index 18045f84aaf..38cf9a097dd 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToTargetEffect.java
@@ -10,7 +10,6 @@ import mage.game.Game;
import mage.game.events.GameEvent;
/**
- *
* @author BetaSteward_at_googlemail.com
*/
public class PreventDamageToTargetEffect extends PreventionEffectImpl {
@@ -35,7 +34,7 @@ public class PreventDamageToTargetEffect extends PreventionEffectImpl {
super(duration, 0, onlyCombat, consumable, amountToPreventDynamic);
}
- public PreventDamageToTargetEffect(final PreventDamageToTargetEffect effect) {
+ protected PreventDamageToTargetEffect(final PreventDamageToTargetEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToTargetMultiAmountEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToTargetMultiAmountEffect.java
index e6324d95873..b16e24dac3e 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToTargetMultiAmountEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToTargetMultiAmountEffect.java
@@ -35,7 +35,7 @@ public class PreventDamageToTargetMultiAmountEffect extends PreventionEffectImpl
super(duration, amount, onlyCombat, consumable, dynamicValue);
}
- public PreventDamageToTargetMultiAmountEffect(final PreventDamageToTargetMultiAmountEffect effect) {
+ protected PreventDamageToTargetMultiAmountEffect(final PreventDamageToTargetMultiAmountEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/PreventNextDamageFromChosenSourceToTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventNextDamageFromChosenSourceToTargetEffect.java
index 68a54ea129e..12fd71ba3ea 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/PreventNextDamageFromChosenSourceToTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/PreventNextDamageFromChosenSourceToTargetEffect.java
@@ -16,31 +16,30 @@ import mage.game.events.GameEvent;
import mage.target.TargetSource;
/**
- *
* @author emerald000
*/
public class PreventNextDamageFromChosenSourceToTargetEffect extends PreventionEffectImpl {
protected final TargetSource targetSource;
-
+
public PreventNextDamageFromChosenSourceToTargetEffect(Duration duration) {
this(duration, new FilterObject<>("source"));
}
-
+
public PreventNextDamageFromChosenSourceToTargetEffect(Duration duration, FilterObject
";
}
- public AscendEffect(final AscendEffect effect) {
+ protected AscendEffect(final AscendEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/keyword/BolsterEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/BolsterEffect.java
index 258d3e96d28..eb670149f4a 100644
--- a/Mage/src/main/java/mage/abilities/effects/keyword/BolsterEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/keyword/BolsterEffect.java
@@ -21,7 +21,6 @@ import mage.target.TargetPermanent;
import mage.target.targetpointer.FixedTarget;
/**
- *
* @author LevelX2
*/
public class BolsterEffect extends OneShotEffect {
@@ -38,7 +37,7 @@ public class BolsterEffect extends OneShotEffect {
this.staticText = setText();
}
- public BolsterEffect(final BolsterEffect effect) {
+ protected BolsterEffect(final BolsterEffect effect) {
super(effect);
this.amount = effect.amount;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/keyword/EchoEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/EchoEffect.java
index abe6d19a05a..3905963647c 100644
--- a/Mage/src/main/java/mage/abilities/effects/keyword/EchoEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/keyword/EchoEffect.java
@@ -32,7 +32,7 @@ public class EchoEffect extends OneShotEffect {
this.cost = null;
}
- public EchoEffect(final EchoEffect effect) {
+ protected EchoEffect(final EchoEffect effect) {
super(effect);
this.cost = effect.cost == null ? null : effect.cost.copy();
this.amount = effect.amount;
diff --git a/Mage/src/main/java/mage/abilities/effects/keyword/ExploreSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/ExploreSourceEffect.java
index 87419eee6fa..fddc156a369 100644
--- a/Mage/src/main/java/mage/abilities/effects/keyword/ExploreSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/keyword/ExploreSourceEffect.java
@@ -68,7 +68,7 @@ public class ExploreSourceEffect extends OneShotEffect {
setText();
}
- public ExploreSourceEffect(final ExploreSourceEffect effect) {
+ protected ExploreSourceEffect(final ExploreSourceEffect effect) {
super(effect);
this.showAbilityHint = effect.showAbilityHint;
this.sourceName = effect.sourceName;
diff --git a/Mage/src/main/java/mage/abilities/effects/keyword/ExploreTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/ExploreTargetEffect.java
index 2484a0e84db..a7437635796 100644
--- a/Mage/src/main/java/mage/abilities/effects/keyword/ExploreTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/keyword/ExploreTargetEffect.java
@@ -7,7 +7,6 @@ import mage.constants.Outcome;
import mage.game.Game;
/**
- *
* @author LevelX2
*/
public class ExploreTargetEffect extends OneShotEffect {
@@ -21,7 +20,7 @@ public class ExploreTargetEffect extends OneShotEffect {
this.staticText = ExploreSourceEffect.getRuleText(showAbilityHint);
}
- public ExploreTargetEffect(final ExploreTargetEffect effect) {
+ protected ExploreTargetEffect(final ExploreTargetEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/keyword/FatesealEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/FatesealEffect.java
index c4e3b595c66..81332c811ac 100644
--- a/Mage/src/main/java/mage/abilities/effects/keyword/FatesealEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/keyword/FatesealEffect.java
@@ -18,7 +18,6 @@ import mage.target.common.TargetOpponent;
import mage.util.CardUtil;
/**
- *
* @author LevelX2
*/
@@ -34,7 +33,7 @@ public class FatesealEffect extends OneShotEffect {
this.setText();
}
- public FatesealEffect(final FatesealEffect effect) {
+ protected FatesealEffect(final FatesealEffect effect) {
super(effect);
this.fatesealNumber = effect.fatesealNumber;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/keyword/IncubateEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/IncubateEffect.java
index 7bd6f3c4c90..4111c12f8aa 100644
--- a/Mage/src/main/java/mage/abilities/effects/keyword/IncubateEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/keyword/IncubateEffect.java
@@ -27,7 +27,7 @@ public class IncubateEffect extends OneShotEffect {
" on it and \"{2}: Transform this artifact.\" It transforms into a 0/0 Phyrexian artifact creature.)";
}
- public IncubateEffect(final IncubateEffect effect) {
+ protected IncubateEffect(final IncubateEffect effect) {
super(effect);
this.amount = effect.amount;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/keyword/InvestigateEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/InvestigateEffect.java
index 1ac4c6fc9b2..4dc2e79118a 100644
--- a/Mage/src/main/java/mage/abilities/effects/keyword/InvestigateEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/keyword/InvestigateEffect.java
@@ -31,7 +31,7 @@ public class InvestigateEffect extends OneShotEffect {
this.amount = amount;
}
- public InvestigateEffect(final InvestigateEffect effect) {
+ protected InvestigateEffect(final InvestigateEffect effect) {
super(effect);
this.amount = effect.amount;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/keyword/ManifestTargetPlayerEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/ManifestTargetPlayerEffect.java
index 30010469557..23e0dfba3a8 100644
--- a/Mage/src/main/java/mage/abilities/effects/keyword/ManifestTargetPlayerEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/keyword/ManifestTargetPlayerEffect.java
@@ -20,7 +20,6 @@ import mage.util.CardUtil;
import java.util.Set;
/**
- *
* @author LevelX2
*/
public class ManifestTargetPlayerEffect extends OneShotEffect {
@@ -35,7 +34,7 @@ public class ManifestTargetPlayerEffect extends OneShotEffect {
this.staticText = setText();
}
- public ManifestTargetPlayerEffect(final ManifestTargetPlayerEffect effect) {
+ protected ManifestTargetPlayerEffect(final ManifestTargetPlayerEffect effect) {
super(effect);
this.amount = effect.amount;
this.prefix = effect.prefix;
diff --git a/Mage/src/main/java/mage/abilities/effects/keyword/ProtectionChosenColorAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/ProtectionChosenColorAttachedEffect.java
index 01bb7f25abb..83dd5f3a6e5 100644
--- a/Mage/src/main/java/mage/abilities/effects/keyword/ProtectionChosenColorAttachedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/keyword/ProtectionChosenColorAttachedEffect.java
@@ -30,7 +30,7 @@ public class ProtectionChosenColorAttachedEffect extends ContinuousEffectImpl {
staticText = "enchanted creature has protection from the chosen color" + (notRemoveItself ? ". This effect doesn't remove {this}" : "");
}
- public ProtectionChosenColorAttachedEffect(final ProtectionChosenColorAttachedEffect effect) {
+ protected ProtectionChosenColorAttachedEffect(final ProtectionChosenColorAttachedEffect effect) {
super(effect);
if (effect.chosenColor != null) {
this.chosenColor = effect.chosenColor.copy();
diff --git a/Mage/src/main/java/mage/abilities/effects/keyword/ProtectionChosenColorSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/ProtectionChosenColorSourceEffect.java
index 1ef28aae062..14be2e5ed6b 100644
--- a/Mage/src/main/java/mage/abilities/effects/keyword/ProtectionChosenColorSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/keyword/ProtectionChosenColorSourceEffect.java
@@ -15,7 +15,6 @@ import mage.game.Game;
import mage.game.permanent.Permanent;
/**
- *
* @author LevelX2
*/
public class ProtectionChosenColorSourceEffect extends ContinuousEffectImpl {
@@ -28,7 +27,7 @@ public class ProtectionChosenColorSourceEffect extends ContinuousEffectImpl {
staticText = "{this} has protection from the chosen color";
}
- public ProtectionChosenColorSourceEffect(final ProtectionChosenColorSourceEffect effect) {
+ protected ProtectionChosenColorSourceEffect(final ProtectionChosenColorSourceEffect effect) {
super(effect);
if (effect.chosenColor != null) {
this.chosenColor = effect.chosenColor.copy();
diff --git a/Mage/src/main/java/mage/abilities/effects/keyword/ScryEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/ScryEffect.java
index bebd6ab4ee6..07e69d1bbbd 100644
--- a/Mage/src/main/java/mage/abilities/effects/keyword/ScryEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/keyword/ScryEffect.java
@@ -26,7 +26,7 @@ public class ScryEffect extends OneShotEffect {
this.setText();
}
- public ScryEffect(final ScryEffect effect) {
+ protected ScryEffect(final ScryEffect effect) {
super(effect);
this.scryNumber = effect.scryNumber;
this.showEffectHint = effect.showEffectHint;
diff --git a/Mage/src/main/java/mage/abilities/effects/keyword/SupportEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/SupportEffect.java
index c473476a156..1edcde3b5b1 100644
--- a/Mage/src/main/java/mage/abilities/effects/keyword/SupportEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/keyword/SupportEffect.java
@@ -11,7 +11,6 @@ import mage.target.common.TargetCreaturePermanent;
import mage.util.CardUtil;
/**
- *
* @author LevelX2
*/
public class SupportEffect extends AddCountersTargetEffect {
@@ -29,7 +28,7 @@ public class SupportEffect extends AddCountersTargetEffect {
staticText = setText();
}
- public SupportEffect(final SupportEffect effect) {
+ protected SupportEffect(final SupportEffect effect) {
super(effect);
this.amountSupportTargets = effect.amountSupportTargets;
this.otherPermanent = effect.otherPermanent;
diff --git a/Mage/src/main/java/mage/abilities/effects/keyword/SurveilEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/SurveilEffect.java
index 531d1563960..6b8a251ba75 100644
--- a/Mage/src/main/java/mage/abilities/effects/keyword/SurveilEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/keyword/SurveilEffect.java
@@ -26,7 +26,7 @@ public class SurveilEffect extends OneShotEffect {
this.setText();
}
- public SurveilEffect(final SurveilEffect effect) {
+ protected SurveilEffect(final SurveilEffect effect) {
super(effect);
this.surveilNumber = effect.surveilNumber;
this.showEffectHint = effect.showEffectHint;
diff --git a/Mage/src/main/java/mage/abilities/effects/keyword/SweepEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/SweepEffect.java
index afb6d29d345..b0c68f51b00 100644
--- a/Mage/src/main/java/mage/abilities/effects/keyword/SweepEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/keyword/SweepEffect.java
@@ -16,7 +16,6 @@ import mage.target.TargetPermanent;
import mage.util.CardUtil;
/**
- *
* @author LevelX2
*/
public class SweepEffect extends OneShotEffect {
@@ -29,7 +28,7 @@ public class SweepEffect extends OneShotEffect {
this.staticText = "Sweep — Return any number of " + sweepSubtype + (sweepSubtype.getDescription().endsWith("s") ? "" : "s") + " you control to their owner's hand";
}
- public SweepEffect(final SweepEffect effect) {
+ protected SweepEffect(final SweepEffect effect) {
super(effect);
this.sweepSubtype = effect.sweepSubtype;
}
diff --git a/Mage/src/main/java/mage/abilities/effects/mana/AddConditionalColorlessManaEffect.java b/Mage/src/main/java/mage/abilities/effects/mana/AddConditionalColorlessManaEffect.java
index 407588878df..8fb5636a467 100644
--- a/Mage/src/main/java/mage/abilities/effects/mana/AddConditionalColorlessManaEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/mana/AddConditionalColorlessManaEffect.java
@@ -5,7 +5,6 @@ import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.mana.builder.ConditionalManaBuilder;
/**
- *
* @author LevelX2
*/
public class AddConditionalColorlessManaEffect extends AddConditionalManaEffect {
@@ -18,7 +17,7 @@ public class AddConditionalColorlessManaEffect extends AddConditionalManaEffect
super(Mana.ColorlessMana(amount), manaBuilder, netAmount);
}
- public AddConditionalColorlessManaEffect(final AddConditionalColorlessManaEffect effect) {
+ protected AddConditionalColorlessManaEffect(final AddConditionalColorlessManaEffect effect) {
super(effect);
}
diff --git a/Mage/src/main/java/mage/abilities/effects/mana/AddConditionalManaEffect.java b/Mage/src/main/java/mage/abilities/effects/mana/AddConditionalManaEffect.java
index a4c42de4736..774b46b5785 100644
--- a/Mage/src/main/java/mage/abilities/effects/mana/AddConditionalManaEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/mana/AddConditionalManaEffect.java
@@ -33,7 +33,7 @@ public class AddConditionalManaEffect extends ManaEffect {
}
- public AddConditionalManaEffect(final AddConditionalManaEffect effect) {
+ protected AddConditionalManaEffect(final AddConditionalManaEffect effect) {
super(effect);
this.mana = effect.mana.copy();
this.manaBuilder = effect.manaBuilder;
diff --git a/Mage/src/main/java/mage/abilities/effects/mana/AddConditionalManaOfAnyColorEffect.java b/Mage/src/main/java/mage/abilities/effects/mana/AddConditionalManaOfAnyColorEffect.java
index cda4c5d72a8..3d920a70455 100644
--- a/Mage/src/main/java/mage/abilities/effects/mana/AddConditionalManaOfAnyColorEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/mana/AddConditionalManaOfAnyColorEffect.java
@@ -1,8 +1,5 @@
package mage.abilities.effects.mana;
-import java.util.ArrayList;
-import java.util.List;
-import mage.ConditionalMana;
import mage.Mana;
import mage.abilities.Ability;
import mage.abilities.dynamicvalue.DynamicValue;
@@ -15,6 +12,9 @@ import mage.players.Player;
import mage.util.CardUtil;
import org.apache.log4j.Logger;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* @author noxx
*/
@@ -51,7 +51,7 @@ public class AddConditionalManaOfAnyColorEffect extends ManaEffect {
+ ". " + manaBuilder.getRule();
}
- public AddConditionalManaOfAnyColorEffect(final AddConditionalManaOfAnyColorEffect effect) {
+ protected AddConditionalManaOfAnyColorEffect(final AddConditionalManaOfAnyColorEffect effect) {
super(effect);
this.amount = effect.amount;
this.netAmount = effect.netAmount;
@@ -96,7 +96,7 @@ public class AddConditionalManaOfAnyColorEffect extends ManaEffect {
if (choice.getChoice() == null) {
return null;
}
- return new ConditionalMana(manaBuilder.setMana(choice.getMana(value), source, game).build());
+ return manaBuilder.setMana(choice.getMana(value), source, game).build();
}
List