diff --git a/Mage.Sets/src/mage/sets/apocalypse/MaskOfIntolerance.java b/Mage.Sets/src/mage/sets/apocalypse/MaskOfIntolerance.java index 5a5cebcb19..c0ac3330e6 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/MaskOfIntolerance.java +++ b/Mage.Sets/src/mage/sets/apocalypse/MaskOfIntolerance.java @@ -56,7 +56,7 @@ public class MaskOfIntolerance extends CardImpl { // At the beginning of each player's upkeep, if there are four or more basic land types among lands that player controls, Mask of Intolerance deals 3 damage to him or her. TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), TargetController.ANY, false); this.addAbility(new ConditionalTriggeredAbility(ability, new MaskOfIntoleranceCondition(), - "At the beginning of each player's upkeep, if there are four or more basic land types among lands that player controls, Mask of Intolerance deals 3 damage to him or her.")); + "At the beginning of each player's upkeep, if there are four or more basic land types among lands that player controls, {this} deals 3 damage to him or her.")); } public MaskOfIntolerance(final MaskOfIntolerance card) { diff --git a/Mage.Sets/src/mage/sets/planeshift/MaliciousAdvice.java b/Mage.Sets/src/mage/sets/planeshift/MaliciousAdvice.java index 9633c1f419..a08dc49ceb 100644 --- a/Mage.Sets/src/mage/sets/planeshift/MaliciousAdvice.java +++ b/Mage.Sets/src/mage/sets/planeshift/MaliciousAdvice.java @@ -67,9 +67,6 @@ public class MaliciousAdvice extends CardImpl { effect.setText("Tap X target artifacts, creatures, and/or lands"); this.getSpellAbility().addEffect(effect); this.getSpellAbility().addEffect(new LoseLifeSourceControllerEffect(new ManacostVariableValue())); - // Correct number of targets will be set in adjustTargets - // I'm not sure if/why this needs to be here, but other such cards do have it... - this.getSpellAbility().addTarget(new TargetPermanent(filter)); } @Override diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Addle.java b/Mage.Sets/src/mage/sets/vintagemasters/Addle.java index baa462bbf4..3ce4e067d5 100644 --- a/Mage.Sets/src/mage/sets/vintagemasters/Addle.java +++ b/Mage.Sets/src/mage/sets/vintagemasters/Addle.java @@ -95,7 +95,7 @@ class AddleEffect extends OneShotEffect { controller.choose(outcome, choice, game); ObjectColor color = choice.getColor(); if(color != null) { - game.informPlayers(new StringBuilder(controller.getLogName()).append(" chooses ").append(color).toString()); + game.informPlayers(controller.getLogName() + " chooses " + color + "."); FilterCard filter = new FilterCard(); filter.add(new ColorPredicate(color)); Effect effect = new DiscardCardYouChooseTargetEffect(filter); diff --git a/Mage/src/mage/abilities/dynamicvalue/common/DomainValue.java b/Mage/src/mage/abilities/dynamicvalue/common/DomainValue.java index 9d02189166..06c0efeef4 100644 --- a/Mage/src/mage/abilities/dynamicvalue/common/DomainValue.java +++ b/Mage/src/mage/abilities/dynamicvalue/common/DomainValue.java @@ -15,7 +15,7 @@ public class DomainValue implements DynamicValue { private Integer amount; private boolean countTargetPlayer; - private UUID player; + private UUID playerId; public DomainValue() { this(1); @@ -34,15 +34,15 @@ public class DomainValue implements DynamicValue { this.countTargetPlayer = countTargetPlayer; } - public DomainValue(Integer amount, UUID player) { + public DomainValue(Integer amount, UUID playerId) { this(amount, false); - this.player = player; + this.playerId = playerId; } public DomainValue(final DomainValue dynamicValue) { this.amount = dynamicValue.amount; this.countTargetPlayer = dynamicValue.countTargetPlayer; - this.player = dynamicValue.player; + this.playerId = dynamicValue.playerId; } @Override @@ -53,8 +53,8 @@ public class DomainValue implements DynamicValue { int haveSwamps = 0; int haveForests = 0; UUID targetPlayer; - if(player != null) { - targetPlayer = player; + if(playerId != null) { + targetPlayer = playerId; } else if(countTargetPlayer) { targetPlayer = sourceAbility.getTargets().getFirstTarget(); diff --git a/Mage/src/mage/abilities/effects/common/DamageAttachedControllerEffect.java b/Mage/src/mage/abilities/effects/common/DamageAttachedControllerEffect.java index 59d67607b1..b248481aad 100644 --- a/Mage/src/mage/abilities/effects/common/DamageAttachedControllerEffect.java +++ b/Mage/src/mage/abilities/effects/common/DamageAttachedControllerEffect.java @@ -82,7 +82,7 @@ public class DamageAttachedControllerEffect extends OneShotEffect { if (staticText != null && !staticText.isEmpty()) { return staticText; } - return "{this} deals " + amount + " to that creature's controller"; + return "{this} deals " + amount + " damage to that creature's controller"; } }