From 43d305a4b19be8831e2d7da9c6fad15eb82c4ecb Mon Sep 17 00:00:00 2001 From: Ingmar Goudt Date: Mon, 31 Dec 2018 20:40:21 +0100 Subject: [PATCH] no need to use a stringbuilder for single line String creation. Java will compile this to use a StringBuilder automatically. StringBuilder performs best when initialized outside a loop --- Mage.Sets/src/mage/cards/c/CombustibleGearhulk.java | 4 ++-- Mage.Sets/src/mage/cards/c/CutTheTethers.java | 2 +- Mage.Sets/src/mage/cards/e/ExtraplanarLens.java | 2 +- Mage.Sets/src/mage/cards/e/EyeOfDoom.java | 2 +- Mage.Sets/src/mage/cards/f/FieryGambit.java | 4 ++-- Mage.Sets/src/mage/cards/f/FightOrFlight.java | 4 +--- Mage.Sets/src/mage/cards/g/GaeasBlessing.java | 2 +- Mage.Sets/src/mage/cards/g/GangUp.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinKaboomist.java | 2 +- Mage.Sets/src/mage/cards/g/Godsend.java | 2 +- Mage.Sets/src/mage/cards/g/GravebaneZombie.java | 2 +- Mage.Sets/src/mage/cards/g/GreatbowDoyen.java | 2 +- Mage.Sets/src/mage/cards/g/GusthasScepter.java | 2 +- Mage.Sets/src/mage/cards/h/Heartmender.java | 4 ++-- Mage.Sets/src/mage/cards/h/HiddenPredators.java | 2 +- Mage.Sets/src/mage/cards/h/HiddenStrings.java | 4 ++-- Mage.Sets/src/mage/cards/h/HourOfEternity.java | 2 +- Mage.Sets/src/mage/cards/i/IdentityThief.java | 2 +- Mage.Sets/src/mage/cards/i/IllusionistsBracers.java | 2 +- Mage.Sets/src/mage/cards/i/IncreasingVengeance.java | 2 +- Mage.Sets/src/mage/cards/i/IsochronScepter.java | 2 +- Mage.Sets/src/mage/cards/j/JaceArchitectOfThought.java | 4 ++-- Mage.Sets/src/mage/cards/j/JadeMonolith.java | 2 +- Mage.Sets/src/mage/cards/j/JarJarBinks.java | 2 +- Mage.Sets/src/mage/cards/j/JestersScepter.java | 2 +- Mage.Sets/src/mage/cards/j/Juxtapose.java | 6 +++--- Mage.Sets/src/mage/cards/k/KavuPredator.java | 4 ++-- Mage.Sets/src/mage/cards/k/KillingGlare.java | 2 +- Mage.Sets/src/mage/cards/k/KioraTheCrashingWave.java | 4 ++-- Mage.Sets/src/mage/cards/k/KurkeshOnakkeAncient.java | 2 +- Mage.Sets/src/mage/cards/l/LastLaugh.java | 2 +- Mage.Sets/src/mage/cards/l/LegionsLanding.java | 2 +- Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java | 2 +- Mage.Sets/src/mage/cards/l/LurkingJackals.java | 2 +- Mage.Sets/src/mage/cards/m/ManaChargedDragon.java | 2 +- Mage.Sets/src/mage/cards/m/ManaVortex.java | 2 +- Mage.Sets/src/mage/cards/m/MartyrOfBones.java | 2 +- Mage.Sets/src/mage/cards/m/MerenOfClanNelToth.java | 2 +- Mage.Sets/src/mage/cards/m/MindsAglow.java | 2 +- Mage.Sets/src/mage/cards/m/MinionOfTheWastes.java | 4 ++-- Mage.Sets/src/mage/cards/m/MogisGodOfSlaughter.java | 6 ++---- Mage.Sets/src/mage/cards/m/Moonmist.java | 2 +- Mage.Sets/src/mage/cards/m/MorgueBurst.java | 4 +--- Mage.Sets/src/mage/cards/m/MortalObstinacy.java | 2 +- Mage.Sets/src/mage/cards/m/MossbridgeTroll.java | 2 +- Mage.Sets/src/mage/cards/m/MyrBattlesphere.java | 4 ++-- Mage.Sets/src/mage/cards/n/NamelessRace.java | 4 ++-- Mage.Sets/src/mage/cards/o/OpalAvenger.java | 2 +- Mage.Sets/src/mage/cards/o/OrderOfSuccession.java | 2 +- Mage.Sets/src/mage/cards/o/OverwhelmingInstinct.java | 2 +- Mage.Sets/src/mage/cards/p/ParadoxicalOutcome.java | 4 ++-- Mage.Sets/src/mage/cards/p/PardicDragon.java | 2 +- Mage.Sets/src/mage/cards/p/PhyrexianDreadnought.java | 2 +- Mage.Sets/src/mage/cards/p/PhyrexianProcessor.java | 4 ++-- Mage.Sets/src/mage/cards/p/PlagueOfVermin.java | 2 +- Mage.Sets/src/mage/cards/p/PorphyryNodes.java | 4 ++-- Mage.Sets/src/mage/cards/p/PowerSink.java | 4 ++-- Mage.Sets/src/mage/cards/p/PredatoryAdvantage.java | 3 +-- Mage.Sets/src/mage/cards/p/PurgingScythe.java | 2 +- Mage.Sets/src/mage/cards/r/Repeal.java | 2 +- Mage.Sets/src/mage/cards/r/ReverseTheSands.java | 2 +- Mage.Sets/src/mage/cards/r/Riftsweeper.java | 2 +- Mage.Sets/src/mage/cards/r/RithTheAwakener.java | 2 +- Mage.Sets/src/mage/cards/s/SageOfHours.java | 10 +++++----- Mage.Sets/src/mage/cards/s/SatyrFiredancer.java | 2 +- Mage.Sets/src/mage/cards/s/SavageSummoning.java | 6 +++--- Mage.Sets/src/mage/cards/s/ScoutsWarning.java | 4 ++-- Mage.Sets/src/mage/cards/s/SharedTrauma.java | 2 +- Mage.Sets/src/mage/cards/s/ShatteredCrypt.java | 2 +- Mage.Sets/src/mage/cards/s/ShattergangBrothers.java | 2 +- Mage.Sets/src/mage/cards/s/ShieldOfTheAvatar.java | 2 +- Mage.Sets/src/mage/cards/s/SigilCaptain.java | 4 +--- Mage.Sets/src/mage/cards/s/SkyfireKirin.java | 2 +- Mage.Sets/src/mage/cards/s/SoulSeizer.java | 2 +- Mage.Sets/src/mage/cards/s/SpellBlast.java | 2 +- Mage.Sets/src/mage/cards/s/SpellRupture.java | 2 +- Mage.Sets/src/mage/cards/s/Spellbinder.java | 2 +- Mage.Sets/src/mage/cards/s/SpellstutterSprite.java | 2 +- Mage.Sets/src/mage/cards/s/SpitefulReturned.java | 2 +- Mage.Sets/src/mage/cards/s/StandOrFall.java | 4 +--- Mage.Sets/src/mage/cards/s/StonewiseFortifier.java | 8 ++++---- Mage.Sets/src/mage/cards/s/StrionicResonator.java | 4 +--- Mage.Sets/src/mage/cards/s/StromkirkOccultist.java | 2 +- Mage.Sets/src/mage/cards/s/SurveyorsScope.java | 2 +- Mage.Sets/src/mage/cards/t/TaintedPact.java | 2 +- Mage.Sets/src/mage/cards/t/TalusPaladin.java | 5 ++--- Mage.Sets/src/mage/cards/t/Tariff.java | 3 +-- Mage.Sets/src/mage/cards/t/TaskMageAssembly.java | 2 +- Mage.Sets/src/mage/cards/t/Temper.java | 2 +- Mage.Sets/src/mage/cards/t/TemptWithReflections.java | 2 +- Mage.Sets/src/mage/cards/t/TestOfFaith.java | 2 +- Mage.Sets/src/mage/cards/t/ThoughtPrison.java | 2 +- Mage.Sets/src/mage/cards/t/TideOfWar.java | 2 +- Mage.Sets/src/mage/cards/t/ToilsOfNightAndDay.java | 4 ++-- Mage.Sets/src/mage/cards/t/TrespassersCurse.java | 2 +- Mage.Sets/src/mage/cards/t/TrevaTheRenewer.java | 2 +- Mage.Sets/src/mage/cards/t/TritonTactics.java | 2 +- .../src/mage/cards/u/UneshCriosphinxSovereign.java | 2 +- Mage.Sets/src/mage/cards/u/UnexpectedResults.java | 2 +- Mage.Sets/src/mage/cards/v/VectisDominator.java | 4 ++-- Mage.Sets/src/mage/cards/v/VeiledCrocodile.java | 2 +- Mage.Sets/src/mage/cards/v/VeteranBrawlers.java | 2 +- Mage.Sets/src/mage/cards/v/VizkopaConfessor.java | 2 +- Mage.Sets/src/mage/cards/w/WellOfLostDreams.java | 2 +- Mage.Sets/src/mage/cards/w/WhimsOfTheFates.java | 4 ++-- Mage.Sets/src/mage/cards/w/WidespreadPanic.java | 2 +- Mage.Sets/src/mage/cards/w/WorldQueller.java | 2 +- Mage.Sets/src/mage/cards/x/XantidSwarm.java | 2 +- Mage.Sets/src/mage/cards/z/ZhurTaaDruid.java | 2 +- 109 files changed, 140 insertions(+), 155 deletions(-) diff --git a/Mage.Sets/src/mage/cards/c/CombustibleGearhulk.java b/Mage.Sets/src/mage/cards/c/CombustibleGearhulk.java index a78c0eadb6c..056ea5c7438 100644 --- a/Mage.Sets/src/mage/cards/c/CombustibleGearhulk.java +++ b/Mage.Sets/src/mage/cards/c/CombustibleGearhulk.java @@ -86,8 +86,8 @@ class CombustibleGearhulkEffect extends OneShotEffect { if (opponentId != null) { Player opponent = game.getPlayer(opponentId); if (opponent != null) { - StringBuilder sb = new StringBuilder("Have " + controller.getLogName() + " draw three cards?"); - if (opponent.chooseUse(outcome, sb.toString(), source, game)) { + String questionDrawThree = "Have " + controller.getLogName() + " draw three cards?"; + if (opponent.chooseUse(outcome, questionDrawThree, source, game)) { if (!game.isSimulation()) { game.informPlayers(opponent.getLogName() + " lets " + controller.getLogName() + " draw three cards"); } diff --git a/Mage.Sets/src/mage/cards/c/CutTheTethers.java b/Mage.Sets/src/mage/cards/c/CutTheTethers.java index 3536c265b7a..3d2d7d499dc 100644 --- a/Mage.Sets/src/mage/cards/c/CutTheTethers.java +++ b/Mage.Sets/src/mage/cards/c/CutTheTethers.java @@ -69,7 +69,7 @@ class CutTheTethersEffect extends OneShotEffect { Player player = game.getPlayer(creature.getControllerId()); if (player != null) { boolean paid = false; - if (player.chooseUse(outcome, new StringBuilder("Pay {3} to keep ").append(creature.getName()).append(" on the battlefield?").toString(), source, game)) { + if (player.chooseUse(outcome, "Pay {3} to keep " + creature.getName() + " on the battlefield?", source, game)) { Cost cost = new GenericManaCost(3); if (!cost.pay(source, game, source.getSourceId(), creature.getControllerId(), false, null)) { paid = true; diff --git a/Mage.Sets/src/mage/cards/e/ExtraplanarLens.java b/Mage.Sets/src/mage/cards/e/ExtraplanarLens.java index f3568f27acb..39767e1caeb 100644 --- a/Mage.Sets/src/mage/cards/e/ExtraplanarLens.java +++ b/Mage.Sets/src/mage/cards/e/ExtraplanarLens.java @@ -138,7 +138,7 @@ class ExtraplanarLensTriggeredAbility extends TriggeredManaAbility { @Override public String getRule() { - return new StringBuilder("Whenever a land with the same name as the exiled card is tapped for mana, ").append(super.getRule()).toString(); + return "Whenever a land with the same name as the exiled card is tapped for mana, " + super.getRule(); } @Override diff --git a/Mage.Sets/src/mage/cards/e/EyeOfDoom.java b/Mage.Sets/src/mage/cards/e/EyeOfDoom.java index e580ff068cc..da09bdeea46 100644 --- a/Mage.Sets/src/mage/cards/e/EyeOfDoom.java +++ b/Mage.Sets/src/mage/cards/e/EyeOfDoom.java @@ -90,7 +90,7 @@ class EyeOfDoomEffect extends OneShotEffect { Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent != null) { permanents.add(permanent); - game.informPlayers((new StringBuilder(player.getLogName()).append(" chooses ").append(permanent.getName()).toString())); + game.informPlayers(player.getLogName() + " chooses " + permanent.getName()); } } player = playerList.getNext(game); diff --git a/Mage.Sets/src/mage/cards/f/FieryGambit.java b/Mage.Sets/src/mage/cards/f/FieryGambit.java index 05021173891..3a5ab06bdf3 100644 --- a/Mage.Sets/src/mage/cards/f/FieryGambit.java +++ b/Mage.Sets/src/mage/cards/f/FieryGambit.java @@ -66,8 +66,8 @@ class FieryGambitEffect extends OneShotEffect { boolean controllerStopped = false; while (controller.flipCoin(game)) { ++flipsWon; - if (!controller.chooseUse(outcome, new StringBuilder("You won ").append(flipsWon).append(flipsWon == 1 ? " flip." : " flips.") - .append(" Flip another coin?").toString(), source, game)) { + if (!controller.chooseUse(outcome, "You won " + flipsWon + (flipsWon == 1 ? " flip." : " flips.") + + " Flip another coin?", source, game)) { controllerStopped = true; break; } diff --git a/Mage.Sets/src/mage/cards/f/FightOrFlight.java b/Mage.Sets/src/mage/cards/f/FightOrFlight.java index 69e34a94fdb..6e88e228ce3 100644 --- a/Mage.Sets/src/mage/cards/f/FightOrFlight.java +++ b/Mage.Sets/src/mage/cards/f/FightOrFlight.java @@ -99,9 +99,7 @@ class FightOrFlightEffect extends OneShotEffect { game.addEffect(effect, source); } } - StringBuilder sb = new StringBuilder("Creatures that can attack this turn: "); - sb.append(otherPile.stream().map(Permanent::getLogName).collect(Collectors.joining(", "))); - game.informPlayers(sb.toString()); + game.informPlayers("Creatures that can attack this turn: " + otherPile.stream().map(Permanent::getLogName).collect(Collectors.joining(", "))); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/g/GaeasBlessing.java b/Mage.Sets/src/mage/cards/g/GaeasBlessing.java index f3ab537d199..62b9516c83c 100644 --- a/Mage.Sets/src/mage/cards/g/GaeasBlessing.java +++ b/Mage.Sets/src/mage/cards/g/GaeasBlessing.java @@ -155,7 +155,7 @@ class GaeasBlessingGraveToLibraryEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { - game.informPlayers(new StringBuilder(controller.getLogName()).append(" shuffle their graveyard into their library").toString()); + game.informPlayers(controller.getLogName() + " shuffle their graveyard into their library"); for (Card card : controller.getGraveyard().getCards(game)) { controller.moveCardToLibraryWithInfo(card, source.getSourceId(), game, Zone.GRAVEYARD, true, true); } diff --git a/Mage.Sets/src/mage/cards/g/GangUp.java b/Mage.Sets/src/mage/cards/g/GangUp.java index 5106c8e4635..7c68d54158b 100644 --- a/Mage.Sets/src/mage/cards/g/GangUp.java +++ b/Mage.Sets/src/mage/cards/g/GangUp.java @@ -41,7 +41,7 @@ public final class GangUp extends CardImpl { if (ability instanceof SpellAbility) { int xValue = ability.getManaCostsToPay().getX(); ability.getTargets().clear(); - FilterCreaturePermanent filter = new FilterCreaturePermanent(new StringBuilder("creature with power ").append(xValue).append(" or less").toString()); + FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power " + xValue + " or less"); filter.add(new PowerPredicate(ComparisonType.FEWER_THAN, xValue + 1)); ability.addTarget(new TargetCreaturePermanent(filter)); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinKaboomist.java b/Mage.Sets/src/mage/cards/g/GoblinKaboomist.java index 59f04faf76a..16db093cebf 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinKaboomist.java +++ b/Mage.Sets/src/mage/cards/g/GoblinKaboomist.java @@ -71,7 +71,7 @@ class GoblinKaboomistFlipCoinEffect extends OneShotEffect { Permanent permanent = game.getPermanent(source.getSourceId()); if (player != null && permanent != null) { if (!player.flipCoin(game)) { - String message = new StringBuilder(permanent.getLogName()).append(" deals 2 damage to itself").toString(); + String message = permanent.getLogName() + " deals 2 damage to itself"; game.informPlayers(message); permanent.damage(2, source.getSourceId(), game, false, true); } diff --git a/Mage.Sets/src/mage/cards/g/Godsend.java b/Mage.Sets/src/mage/cards/g/Godsend.java index cc052a44ceb..0ccda6a3390 100644 --- a/Mage.Sets/src/mage/cards/g/Godsend.java +++ b/Mage.Sets/src/mage/cards/g/Godsend.java @@ -112,7 +112,7 @@ class GodsendTriggeredAbility extends TriggeredAbilityImpl { this.getEffects().get(0).setTargetPointer(new FixedTarget(possibleTargets.iterator().next())); } else { this.getEffects().get(0).setTargetPointer(new FirstTargetPointer()); - targetName = new StringBuilder(targetName).append("equipped by ").append(equipment.getName()).toString(); + targetName = targetName + " equipped by " + equipment.getName(); FilterCreaturePermanent filter = new FilterCreaturePermanent(targetName); List uuidPredicates = new ArrayList<>(); for (UUID creatureId : possibleTargets) { diff --git a/Mage.Sets/src/mage/cards/g/GravebaneZombie.java b/Mage.Sets/src/mage/cards/g/GravebaneZombie.java index 3cd58474ac3..43d6a30779f 100644 --- a/Mage.Sets/src/mage/cards/g/GravebaneZombie.java +++ b/Mage.Sets/src/mage/cards/g/GravebaneZombie.java @@ -62,7 +62,7 @@ class GravebaneZombieEffect extends ReplacementEffectImpl { Permanent permanent = ((ZoneChangeEvent) event).getTarget(); if (permanent != null) { if (permanent.moveToZone(Zone.LIBRARY, source.getSourceId(), game, true)) { - game.informPlayers(new StringBuilder(permanent.getName()).append(" was put on the top of its owner's library").toString()); + game.informPlayers(permanent.getName() + " was put on the top of its owner's library"); return true; } } diff --git a/Mage.Sets/src/mage/cards/g/GreatbowDoyen.java b/Mage.Sets/src/mage/cards/g/GreatbowDoyen.java index 0323b7d343a..88be27c426f 100644 --- a/Mage.Sets/src/mage/cards/g/GreatbowDoyen.java +++ b/Mage.Sets/src/mage/cards/g/GreatbowDoyen.java @@ -131,7 +131,7 @@ class GreatbowDoyenEffect extends OneShotEffect { Player player = game.getPlayer(controllerId); if (player != null) { player.damage(damageAmount, sourceOfDamage, game, false, true); - game.informPlayers(new StringBuilder(permanent.getName()).append(" deals ").append(damageAmount).append(" damage to ").append(player.getLogName()).toString()); + game.informPlayers(permanent.getName() + " deals " + damageAmount + " damage to " + player.getLogName()); return true; } } diff --git a/Mage.Sets/src/mage/cards/g/GusthasScepter.java b/Mage.Sets/src/mage/cards/g/GusthasScepter.java index 44446a65d0c..cd0cbddf394 100644 --- a/Mage.Sets/src/mage/cards/g/GusthasScepter.java +++ b/Mage.Sets/src/mage/cards/g/GusthasScepter.java @@ -84,7 +84,7 @@ class GusthasScepterExileEffect extends OneShotEffect { Card card = game.getCard(target.getFirstTarget()); MageObject sourceObject = game.getObject(source.getSourceId()); if (card != null && sourceObject != null) { - if (card.moveToExile(CardUtil.getCardExileZoneId(game, source), new StringBuilder(sourceObject.getIdName()).toString(), source.getSourceId(), game)) { + if (card.moveToExile(CardUtil.getCardExileZoneId(game, source), sourceObject.getIdName(), source.getSourceId(), game)) { card.setFaceDown(true, game); game.addEffect(new GusthasScepterLookAtCardEffect(card.getId()), source); return true; diff --git a/Mage.Sets/src/mage/cards/h/Heartmender.java b/Mage.Sets/src/mage/cards/h/Heartmender.java index 653ead86e2d..7e1249294ae 100644 --- a/Mage.Sets/src/mage/cards/h/Heartmender.java +++ b/Mage.Sets/src/mage/cards/h/Heartmender.java @@ -75,8 +75,8 @@ class HeartmenderEffect extends OneShotEffect { if (creature != null && creature.getCounters(game).getCount(counter.getName()) >= counter.getCount()) { creature.removeCounters(counter.getName(), counter.getCount(), game); - game.informPlayers(new StringBuilder("Removed ").append(counter.getCount()).append(' ').append(counter.getName()) - .append(" counter from ").append(creature.getName()).toString()); + game.informPlayers("Removed " + counter.getCount() + ' ' + counter.getName() + + " counter from " + creature.getName()); applied = true; } } diff --git a/Mage.Sets/src/mage/cards/h/HiddenPredators.java b/Mage.Sets/src/mage/cards/h/HiddenPredators.java index 88f532926e3..689c3237cfe 100644 --- a/Mage.Sets/src/mage/cards/h/HiddenPredators.java +++ b/Mage.Sets/src/mage/cards/h/HiddenPredators.java @@ -109,7 +109,7 @@ class HiddenPredatorsStateTriggeredAbility extends StateTriggeredAbility { @Override public String getRule() { - return new StringBuilder("When an opponent controls a creature with 4 or greater power, if {this} is an enchantment, ").append(super.getRule()).toString(); + return "When an opponent controls a creature with 4 or greater power, if {this} is an enchantment, " + super.getRule(); } } diff --git a/Mage.Sets/src/mage/cards/h/HiddenStrings.java b/Mage.Sets/src/mage/cards/h/HiddenStrings.java index 692e40bb32f..f4f9fcc463a 100644 --- a/Mage.Sets/src/mage/cards/h/HiddenStrings.java +++ b/Mage.Sets/src/mage/cards/h/HiddenStrings.java @@ -71,11 +71,11 @@ class HiddenStringsEffect extends OneShotEffect { Permanent permanent = game.getPermanent(targetId); if (permanent != null) { if (permanent.isTapped()) { - if (player.chooseUse(Outcome.Untap, new StringBuilder("Untap ").append(permanent.getName()).append('?').toString(), source, game)) { + if (player.chooseUse(Outcome.Untap, "Untap " + permanent.getName() + '?', source, game)) { permanent.untap(game); } } else { - if (player.chooseUse(Outcome.Tap, new StringBuilder("Tap ").append(permanent.getName()).append('?').toString(), source, game)) { + if (player.chooseUse(Outcome.Tap, "Tap " + permanent.getName() + '?', source, game)) { permanent.tap(game); } } diff --git a/Mage.Sets/src/mage/cards/h/HourOfEternity.java b/Mage.Sets/src/mage/cards/h/HourOfEternity.java index 0d7d4995442..ed2ced04216 100644 --- a/Mage.Sets/src/mage/cards/h/HourOfEternity.java +++ b/Mage.Sets/src/mage/cards/h/HourOfEternity.java @@ -42,7 +42,7 @@ public final class HourOfEternity extends CardImpl { if (ability instanceof SpellAbility) { ability.getTargets().clear(); int xValue = ability.getManaCostsToPay().getX(); - Target target = new TargetCardInYourGraveyard(xValue, new FilterCreatureCard(new StringBuilder(xValue).append(xValue != 1 ? " creature cards" : "creature card").append(" from your graveyard").toString())); + Target target = new TargetCardInYourGraveyard(xValue, new FilterCreatureCard((xValue != 1 ? " creature cards" : "creature card") + " from your graveyard")); ability.addTarget(target); } } diff --git a/Mage.Sets/src/mage/cards/i/IdentityThief.java b/Mage.Sets/src/mage/cards/i/IdentityThief.java index 61d182b21b0..9047dc09554 100644 --- a/Mage.Sets/src/mage/cards/i/IdentityThief.java +++ b/Mage.Sets/src/mage/cards/i/IdentityThief.java @@ -87,7 +87,7 @@ class IdentityThiefAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return new StringBuilder("Whenever {this} attacks, ").append(super.getRule()).toString(); + return "Whenever {this} attacks, " + super.getRule(); } @Override diff --git a/Mage.Sets/src/mage/cards/i/IllusionistsBracers.java b/Mage.Sets/src/mage/cards/i/IllusionistsBracers.java index 389d705645c..257ca55ff20 100644 --- a/Mage.Sets/src/mage/cards/i/IllusionistsBracers.java +++ b/Mage.Sets/src/mage/cards/i/IllusionistsBracers.java @@ -112,7 +112,7 @@ class CopyActivatedAbilityEffect extends OneShotEffect { Permanent sourcePermanent = game.getPermanent(source.getSourceId()); if (ability != null && controller != null && sourcePermanent != null) { ability.createCopyOnStack(game, source, source.getControllerId(), true); - game.informPlayers(new StringBuilder(sourcePermanent.getName()).append(": ").append(controller.getLogName()).append(" copied activated ability").toString()); + game.informPlayers(sourcePermanent.getName() + ": " + controller.getLogName() + " copied activated ability"); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/i/IncreasingVengeance.java b/Mage.Sets/src/mage/cards/i/IncreasingVengeance.java index 11e1d70dbb4..34392a641b4 100644 --- a/Mage.Sets/src/mage/cards/i/IncreasingVengeance.java +++ b/Mage.Sets/src/mage/cards/i/IncreasingVengeance.java @@ -76,7 +76,7 @@ class IncreasingVengeanceEffect extends OneShotEffect { if (spell != null) { StackObject stackObjectCopy = spell.createCopyOnStack(game, source, source.getControllerId(), true); if (stackObjectCopy instanceof Spell) { - game.informPlayers(new StringBuilder(controller.getLogName()).append(((Spell) stackObjectCopy).getActivatedMessage(game)).toString()); + game.informPlayers(controller.getLogName() + ((Spell) stackObjectCopy).getActivatedMessage(game)); } Spell sourceSpell = (Spell) game.getStack().getStackObject(source.getSourceId()); if (sourceSpell != null) { diff --git a/Mage.Sets/src/mage/cards/i/IsochronScepter.java b/Mage.Sets/src/mage/cards/i/IsochronScepter.java index b23831f56bb..832952667ce 100644 --- a/Mage.Sets/src/mage/cards/i/IsochronScepter.java +++ b/Mage.Sets/src/mage/cards/i/IsochronScepter.java @@ -130,7 +130,7 @@ class IsochronScepterCopyEffect extends OneShotEffect { if (scepter != null && scepter.getImprinted() != null && !scepter.getImprinted().isEmpty()) { Card imprintedInstant = game.getCard(scepter.getImprinted().get(0)); if (imprintedInstant != null && game.getState().getZone(imprintedInstant.getId()) == Zone.EXILED) { - if (controller.chooseUse(outcome, new StringBuilder("Create a copy of ").append(imprintedInstant.getName()).append('?').toString(), source, game)) { + if (controller.chooseUse(outcome, "Create a copy of " + imprintedInstant.getName() + '?', source, game)) { Card copiedCard = game.copyCard(imprintedInstant, source, source.getControllerId()); if (copiedCard != null) { game.getExile().add(source.getSourceId(), "", copiedCard); diff --git a/Mage.Sets/src/mage/cards/j/JaceArchitectOfThought.java b/Mage.Sets/src/mage/cards/j/JaceArchitectOfThought.java index 4f6b074b34f..7aaaf9cf64f 100644 --- a/Mage.Sets/src/mage/cards/j/JaceArchitectOfThought.java +++ b/Mage.Sets/src/mage/cards/j/JaceArchitectOfThought.java @@ -262,11 +262,11 @@ class JaceArchitectOfThoughtEffect3 extends OneShotEffect { UUID playerId = targetPlayer.getFirstTarget(); Player player = game.getPlayer(playerId); if (player != null) { - String playerName = new StringBuilder(player.getLogName()).append("'s").toString(); + String playerName = player.getLogName() + "'s"; if (source.isControlledBy(player.getId())) { playerName = "your"; } - TargetCardInLibrary target = new TargetCardInLibrary(new FilterNonlandCard(new StringBuilder("nonland card from ").append(playerName).append(" library").toString())); + TargetCardInLibrary target = new TargetCardInLibrary(new FilterNonlandCard("nonland card from " + playerName + " library")); if (controller.searchLibrary(target, game, playerId, !checkList.contains(playerId))) { checkList.add(playerId); UUID targetId = target.getFirstTarget(); diff --git a/Mage.Sets/src/mage/cards/j/JadeMonolith.java b/Mage.Sets/src/mage/cards/j/JadeMonolith.java index 3202fe33ecd..91cec8c1ba7 100644 --- a/Mage.Sets/src/mage/cards/j/JadeMonolith.java +++ b/Mage.Sets/src/mage/cards/j/JadeMonolith.java @@ -81,7 +81,7 @@ class JadeMonolithRedirectionEffect extends ReplacementEffectImpl { DamageEvent damageEvent = (DamageEvent) event; if (controller != null && targetCreature != null && sourceObject != null) { controller.damage(damageEvent.getAmount(), damageEvent.getSourceId(), game, damageEvent.isCombatDamage(), damageEvent.isPreventable(), damageEvent.getAppliedEffects()); - StringBuilder sb = new StringBuilder(sourceObject != null ? sourceObject.getLogName() : ""); + StringBuilder sb = new StringBuilder(sourceObject.getLogName()); sb.append(": ").append(damageEvent.getAmount()).append(" damage redirected from ").append(targetCreature.getLogName()); sb.append(" to ").append(controller.getLogName()); game.informPlayers(sb.toString()); diff --git a/Mage.Sets/src/mage/cards/j/JarJarBinks.java b/Mage.Sets/src/mage/cards/j/JarJarBinks.java index 242ca0f0192..d9fb62510e6 100644 --- a/Mage.Sets/src/mage/cards/j/JarJarBinks.java +++ b/Mage.Sets/src/mage/cards/j/JarJarBinks.java @@ -163,7 +163,7 @@ class JarJarBinksTapEffect extends OneShotEffect { } } if (permanentToTap != null) { - game.informPlayers(new StringBuilder(sourcePermanent.getName()).append(" chosen creature: ").append(permanentToTap.getName()).toString()); + game.informPlayers(sourcePermanent.getName() + " chosen creature: " + permanentToTap.getName()); return permanentToTap.tap(game); } return true; diff --git a/Mage.Sets/src/mage/cards/j/JestersScepter.java b/Mage.Sets/src/mage/cards/j/JestersScepter.java index 0744b9ea62d..c67505242e8 100644 --- a/Mage.Sets/src/mage/cards/j/JestersScepter.java +++ b/Mage.Sets/src/mage/cards/j/JestersScepter.java @@ -92,7 +92,7 @@ class JestersScepterEffect extends OneShotEffect { if (targetedPlayer.getLibrary().hasCards()) { Set cardsToExile = targetedPlayer.getLibrary().getTopCards(game, 5); for (Card card : cardsToExile) { - if (card.moveToExile(CardUtil.getCardExileZoneId(game, source), new StringBuilder(sourceObject.getName()).toString(), source.getSourceId(), game)) { + if (card.moveToExile(CardUtil.getCardExileZoneId(game, source), sourceObject.getName(), source.getSourceId(), game)) { card.setFaceDown(true, game); } } diff --git a/Mage.Sets/src/mage/cards/j/Juxtapose.java b/Mage.Sets/src/mage/cards/j/Juxtapose.java index ecc67002684..6c0cddb15ca 100644 --- a/Mage.Sets/src/mage/cards/j/Juxtapose.java +++ b/Mage.Sets/src/mage/cards/j/Juxtapose.java @@ -109,9 +109,9 @@ class JuxtaposeEffect extends ContinuousEffectImpl { permanent1.changeControllerId(targetPlayer.getId(), game); permanent2.changeControllerId(you.getId(), game); - game.informPlayers(new StringBuilder(sourceObject != null ? sourceObject.getLogName() : "").append(": ").append(you.getLogName()) - .append(" and ").append(targetPlayer.getLogName()).append(" exchange control of ").append(permanent1.getLogName()) - .append(" and ").append(permanent2.getName()).toString()); + game.informPlayers((sourceObject != null ? sourceObject.getLogName() : "") + ": " + you.getLogName() + + " and " + targetPlayer.getLogName() + " exchange control of " + permanent1.getLogName() + + " and " + permanent2.getName()); } else { // discard if there are less than 2 permanents discard(); diff --git a/Mage.Sets/src/mage/cards/k/KavuPredator.java b/Mage.Sets/src/mage/cards/k/KavuPredator.java index f1818217a8c..d2f829717d5 100644 --- a/Mage.Sets/src/mage/cards/k/KavuPredator.java +++ b/Mage.Sets/src/mage/cards/k/KavuPredator.java @@ -106,10 +106,10 @@ class KavuPredatorEffect extends OneShotEffect { if (permanent != null) { Integer gainedLife = (Integer) this.getValue("gainedLife"); if (gainedLife != null) { - permanent.addCounters(CounterType.P1P1.createInstance(gainedLife.intValue()), source, game); + permanent.addCounters(CounterType.P1P1.createInstance(gainedLife), source, game); Player player = game.getPlayer(source.getControllerId()); if (player != null) { - game.informPlayers(new StringBuilder(player.getLogName()).append(" puts ").append(gainedLife).append(" +1/+1 counter on ").append(permanent.getName()).toString()); + game.informPlayers(player.getLogName() + " puts " + gainedLife + " +1/+1 counter on " + permanent.getName()); } } return true; diff --git a/Mage.Sets/src/mage/cards/k/KillingGlare.java b/Mage.Sets/src/mage/cards/k/KillingGlare.java index 11de68c5b04..5382bf5557c 100644 --- a/Mage.Sets/src/mage/cards/k/KillingGlare.java +++ b/Mage.Sets/src/mage/cards/k/KillingGlare.java @@ -39,7 +39,7 @@ public final class KillingGlare extends CardImpl { if (ability instanceof SpellAbility) { int xValue = ability.getManaCostsToPay().getX(); ability.getTargets().clear(); - FilterCreaturePermanent filter = new FilterCreaturePermanent(new StringBuilder("creature with power ").append(xValue).append(" or less").toString()); + FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power " + xValue + " or less"); filter.add(new PowerPredicate(ComparisonType.FEWER_THAN, xValue + 1)); ability.addTarget(new TargetCreaturePermanent(filter)); } diff --git a/Mage.Sets/src/mage/cards/k/KioraTheCrashingWave.java b/Mage.Sets/src/mage/cards/k/KioraTheCrashingWave.java index 9e80d8f280f..e5a92f4eaaf 100644 --- a/Mage.Sets/src/mage/cards/k/KioraTheCrashingWave.java +++ b/Mage.Sets/src/mage/cards/k/KioraTheCrashingWave.java @@ -97,7 +97,7 @@ class KioraPreventionEffect extends PreventionEffectImpl { for (UUID targetId : this.getTargetPointer().getTargets(game, source)) { Permanent permanent = game.getPermanent(targetId); if (permanent != null) { - permanent.addInfo(new StringBuilder("kioraPrevention").append(getId()).toString(), CardUtil.addToolTipMarkTags("All damage that would be dealt to and dealt by this permanent is prevented."), game); + permanent.addInfo("kioraPrevention" + getId(), CardUtil.addToolTipMarkTags("All damage that would be dealt to and dealt by this permanent is prevented."), game); } } } @@ -120,7 +120,7 @@ class KioraPreventionEffect extends PreventionEffectImpl { for (UUID targetId : this.getTargetPointer().getTargets(game, source)) { Permanent permanent = game.getPermanent(targetId); if (permanent != null) { - permanent.addInfo(new StringBuilder("kioraPrevention").append(getId()).toString(), "", game); + permanent.addInfo("kioraPrevention" + getId(), "", game); } } return true; diff --git a/Mage.Sets/src/mage/cards/k/KurkeshOnakkeAncient.java b/Mage.Sets/src/mage/cards/k/KurkeshOnakkeAncient.java index 7fbd372ea54..27be72c1097 100644 --- a/Mage.Sets/src/mage/cards/k/KurkeshOnakkeAncient.java +++ b/Mage.Sets/src/mage/cards/k/KurkeshOnakkeAncient.java @@ -119,7 +119,7 @@ class KurkeshOnakkeAncientEffect extends OneShotEffect { Permanent sourcePermanent = game.getPermanent(source.getSourceId()); if (ability != null && controller != null) { ability.createCopyOnStack(game, source, source.getControllerId(), true); - game.informPlayers(new StringBuilder(sourcePermanent.getName()).append(": ").append(controller.getLogName()).append(" copied activated ability").toString()); + game.informPlayers(sourcePermanent.getName() + ": " + controller.getLogName() + " copied activated ability"); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/l/LastLaugh.java b/Mage.Sets/src/mage/cards/l/LastLaugh.java index 4dd8091503d..1a35b3f9a08 100644 --- a/Mage.Sets/src/mage/cards/l/LastLaugh.java +++ b/Mage.Sets/src/mage/cards/l/LastLaugh.java @@ -73,7 +73,7 @@ class LastLaughStateTriggeredAbility extends StateTriggeredAbility { @Override public String getRule() { - return new StringBuilder("When no creatures are on the battlefield, ").append(super.getRule()).toString() ; + return "When no creatures are on the battlefield, " + super.getRule(); } } diff --git a/Mage.Sets/src/mage/cards/l/LegionsLanding.java b/Mage.Sets/src/mage/cards/l/LegionsLanding.java index 669ac8942f4..d8b6c593da7 100644 --- a/Mage.Sets/src/mage/cards/l/LegionsLanding.java +++ b/Mage.Sets/src/mage/cards/l/LegionsLanding.java @@ -76,6 +76,6 @@ class LegionsLandingTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return new StringBuilder("When you attack with three or more creatures, ").append(super.getRule()).toString(); + return "When you attack with three or more creatures, " + super.getRule(); } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java b/Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java index 9651f38dd55..7335771d0ac 100644 --- a/Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java +++ b/Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java @@ -95,7 +95,7 @@ class LinSivviDefiantHeroEffect extends OneShotEffect { int xCost = source.getManaCostsToPay().getX(); - FilterPermanentCard filter = new FilterPermanentCard(new StringBuilder("Rebel permanent card with converted mana cost ").append(xCost).append(" or less").toString()); + FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with converted mana cost " + xCost + " or less"); filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, xCost + 1)); filter.add(new SubtypePredicate(SubType.REBEL)); TargetCardInLibrary target = new TargetCardInLibrary(filter); diff --git a/Mage.Sets/src/mage/cards/l/LurkingJackals.java b/Mage.Sets/src/mage/cards/l/LurkingJackals.java index 4822bb2c2de..92057b60fdf 100644 --- a/Mage.Sets/src/mage/cards/l/LurkingJackals.java +++ b/Mage.Sets/src/mage/cards/l/LurkingJackals.java @@ -104,7 +104,7 @@ class LurkingJackalsStateTriggeredAbility extends StateTriggeredAbility { @Override public String getRule() { - return new StringBuilder("When an opponent has 10 or less life, if {this} is an enchantment, ").append(super.getRule()).toString(); + return "When an opponent has 10 or less life, if {this} is an enchantment, " + super.getRule(); } } diff --git a/Mage.Sets/src/mage/cards/m/ManaChargedDragon.java b/Mage.Sets/src/mage/cards/m/ManaChargedDragon.java index 33a76756d77..60ff3553499 100644 --- a/Mage.Sets/src/mage/cards/m/ManaChargedDragon.java +++ b/Mage.Sets/src/mage/cards/m/ManaChargedDragon.java @@ -80,7 +80,7 @@ class ManaChargedDragonEffect extends OneShotEffect { payed = true; } } - game.informPlayers(new StringBuilder(player.getLogName()).append(" pays {").append(xValue).append("}.").toString()); + game.informPlayers(player.getLogName() + " pays {" + xValue + "}."); return xValue; } diff --git a/Mage.Sets/src/mage/cards/m/ManaVortex.java b/Mage.Sets/src/mage/cards/m/ManaVortex.java index afe645b9f6d..efb49fa3d8f 100644 --- a/Mage.Sets/src/mage/cards/m/ManaVortex.java +++ b/Mage.Sets/src/mage/cards/m/ManaVortex.java @@ -128,7 +128,7 @@ class ManaVortexStateTriggeredAbility extends StateTriggeredAbility { @Override public String getRule() { - return new StringBuilder("When there are no lands on the battlefield, ").append(super.getRule()).toString() ; + return "When there are no lands on the battlefield, " + super.getRule(); } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/m/MartyrOfBones.java b/Mage.Sets/src/mage/cards/m/MartyrOfBones.java index 8a0bbb5d0bb..e280e71f9ed 100644 --- a/Mage.Sets/src/mage/cards/m/MartyrOfBones.java +++ b/Mage.Sets/src/mage/cards/m/MartyrOfBones.java @@ -88,7 +88,7 @@ class RevealVariableBlackCardsFromHandCost extends VariableCostImpl { RevealVariableBlackCardsFromHandCost() { super("black cards to reveal"); - this.text = new StringBuilder("Reveal ").append(xText).append(" black cards from {this}").toString(); + this.text = "Reveal " + xText + " black cards from {this}"; } RevealVariableBlackCardsFromHandCost(final RevealVariableBlackCardsFromHandCost cost) { diff --git a/Mage.Sets/src/mage/cards/m/MerenOfClanNelToth.java b/Mage.Sets/src/mage/cards/m/MerenOfClanNelToth.java index b3862d6f0c1..9845b838450 100644 --- a/Mage.Sets/src/mage/cards/m/MerenOfClanNelToth.java +++ b/Mage.Sets/src/mage/cards/m/MerenOfClanNelToth.java @@ -97,7 +97,7 @@ class MerenOfClanNelTothEffect extends OneShotEffect { text = " put onto battlefield for "; } card.moveToZone(targetZone, source.getSourceId(), game, false); - game.informPlayers(new StringBuilder("Meren of Clan Nel Toth: ").append(card.getName()).append(text).append(player.getLogName()).toString()); + game.informPlayers("Meren of Clan Nel Toth: " + card.getName() + text + player.getLogName()); return true; } } diff --git a/Mage.Sets/src/mage/cards/m/MindsAglow.java b/Mage.Sets/src/mage/cards/m/MindsAglow.java index 2e1bdf7cfe3..700a7a4c32b 100644 --- a/Mage.Sets/src/mage/cards/m/MindsAglow.java +++ b/Mage.Sets/src/mage/cards/m/MindsAglow.java @@ -100,7 +100,7 @@ class MindsAglowEffect extends OneShotEffect { payed = true; } } - game.informPlayers(new StringBuilder(player.getLogName()).append(" pays {").append(xValue).append("}.").toString()); + game.informPlayers(player.getLogName() + " pays {" + xValue + "}."); return xValue; } } diff --git a/Mage.Sets/src/mage/cards/m/MinionOfTheWastes.java b/Mage.Sets/src/mage/cards/m/MinionOfTheWastes.java index 71c4df4713d..5b5fce962fe 100644 --- a/Mage.Sets/src/mage/cards/m/MinionOfTheWastes.java +++ b/Mage.Sets/src/mage/cards/m/MinionOfTheWastes.java @@ -77,8 +77,8 @@ class MinionOfTheWastesEffect extends OneShotEffect { Card sourceCard = game.getCard(source.getSourceId()); int payAmount = controller.getAmount(0, controller.getLife(), "Pay any amount of life", game); controller.loseLife(payAmount, game, false); - game.informPlayers(new StringBuilder(sourceCard.getLogName()).append(": ").append(controller.getLogName()) - .append(" pays ").append(payAmount).append(" life").toString()); + game.informPlayers(sourceCard.getLogName() + ": " + controller.getLogName() + + " pays " + payAmount + " life"); game.addEffect(new SetPowerToughnessSourceEffect(payAmount, payAmount, Duration.Custom, SubLayer.SetPT_7b), source); return true; } diff --git a/Mage.Sets/src/mage/cards/m/MogisGodOfSlaughter.java b/Mage.Sets/src/mage/cards/m/MogisGodOfSlaughter.java index 8c666bcf210..eef7327fa95 100644 --- a/Mage.Sets/src/mage/cards/m/MogisGodOfSlaughter.java +++ b/Mage.Sets/src/mage/cards/m/MogisGodOfSlaughter.java @@ -118,10 +118,8 @@ class DoUnlessTargetPaysCost extends OneShotEffect { if (!staticText.isEmpty()) { return staticText; } - StringBuilder sb = new StringBuilder(executingEffect.getText(mode)); - sb.append("unless he or she"); - sb.append(getCostText()); - return sb.toString(); + return executingEffect.getText(mode) + "unless they" + + getCostText(); } private String getCostText() { diff --git a/Mage.Sets/src/mage/cards/m/Moonmist.java b/Mage.Sets/src/mage/cards/m/Moonmist.java index 8b199cf09f9..a90d6b45d6e 100644 --- a/Mage.Sets/src/mage/cards/m/Moonmist.java +++ b/Mage.Sets/src/mage/cards/m/Moonmist.java @@ -71,7 +71,7 @@ class MoonmistEffect extends OneShotEffect { for (Permanent permanent: game.getBattlefield().getActivePermanents(filter, source.getControllerId(), game)) { if (permanent.isTransformable()) { permanent.transform(game); - game.informPlayers(new StringBuilder(permanent.getName()).append(" transforms into ").append(permanent.getSecondCardFace().getName()).toString()); + game.informPlayers(permanent.getName() + " transforms into " + permanent.getSecondCardFace().getName()); } } return true; diff --git a/Mage.Sets/src/mage/cards/m/MorgueBurst.java b/Mage.Sets/src/mage/cards/m/MorgueBurst.java index cefb0142fa8..6637ed626e5 100644 --- a/Mage.Sets/src/mage/cards/m/MorgueBurst.java +++ b/Mage.Sets/src/mage/cards/m/MorgueBurst.java @@ -83,8 +83,6 @@ class MorgueBurstEffect extends OneShotEffect { @Override public String getText(Mode mode) { - StringBuilder sb = new StringBuilder(); - sb.append("Return target creature card from your graveyard to your hand. Morgue Burst deals damage to any target equal to the power of the card returned this way"); - return sb.toString(); + return "Return target creature card from your graveyard to your hand. Morgue Burst deals damage to any target equal to the power of the card returned this way"; } } diff --git a/Mage.Sets/src/mage/cards/m/MortalObstinacy.java b/Mage.Sets/src/mage/cards/m/MortalObstinacy.java index 04530a8a012..41f87f79e12 100644 --- a/Mage.Sets/src/mage/cards/m/MortalObstinacy.java +++ b/Mage.Sets/src/mage/cards/m/MortalObstinacy.java @@ -92,7 +92,7 @@ class MortalObstinacyAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return new StringBuilder("Whenever enchanted creature deals combat damage to a player, ").append(super.getRule()).toString(); + return "Whenever enchanted creature deals combat damage to a player, " + super.getRule(); } } diff --git a/Mage.Sets/src/mage/cards/m/MossbridgeTroll.java b/Mage.Sets/src/mage/cards/m/MossbridgeTroll.java index 1790367c6ab..e0c45e08017 100644 --- a/Mage.Sets/src/mage/cards/m/MossbridgeTroll.java +++ b/Mage.Sets/src/mage/cards/m/MossbridgeTroll.java @@ -133,7 +133,7 @@ class MossbridgeTrollCost extends CostImpl { } } } - game.informPlayers(new StringBuilder("Tap creatures with total power of ").append(sumPower).toString()); + game.informPlayers("Tap creatures with total power of " + sumPower); paid = sumPower >= 10; return paid; } diff --git a/Mage.Sets/src/mage/cards/m/MyrBattlesphere.java b/Mage.Sets/src/mage/cards/m/MyrBattlesphere.java index 8349c70f48a..0302a4c60a6 100644 --- a/Mage.Sets/src/mage/cards/m/MyrBattlesphere.java +++ b/Mage.Sets/src/mage/cards/m/MyrBattlesphere.java @@ -125,7 +125,7 @@ class MyrBattlesphereEffect extends OneShotEffect { Permanent myr = game.getPermanentOrLKIBattlefield(source.getSourceId()); int tappedAmount = 0; TargetPermanent target = new TargetPermanent(0, 1, filter, true); - while (true && controller.canRespond()) { + while (controller.canRespond()) { target.clearChosen(); if (target.canChoose(source.getControllerId(), game)) { Map options = new HashMap<>(); @@ -145,7 +145,7 @@ class MyrBattlesphereEffect extends OneShotEffect { } } if (tappedAmount > 0) { - game.informPlayers(new StringBuilder(controller.getLogName()).append(" taps ").append(tappedAmount).append(" Myrs").toString()); + game.informPlayers(controller.getLogName() + " taps " + tappedAmount + " Myrs"); // boost effect game.addEffect(new BoostSourceEffect(tappedAmount, 0, Duration.EndOfTurn), source); // damage to defender diff --git a/Mage.Sets/src/mage/cards/n/NamelessRace.java b/Mage.Sets/src/mage/cards/n/NamelessRace.java index f435ddecb3a..e561b069369 100644 --- a/Mage.Sets/src/mage/cards/n/NamelessRace.java +++ b/Mage.Sets/src/mage/cards/n/NamelessRace.java @@ -100,8 +100,8 @@ class NamelessRaceEffect extends OneShotEffect { int maxAmount = Math.min(permanentsInPlay + cardsInGraveyards, controller.getLife()); int payAmount = controller.getAmount(0, maxAmount, "Pay up to " + maxAmount + " life", game); controller.loseLife(payAmount, game, false); - game.informPlayers(new StringBuilder(sourceCard.getLogName()).append(": ").append(controller.getLogName()) - .append(" pays ").append(payAmount).append(" life").toString()); + game.informPlayers(sourceCard.getLogName() + ": " + controller.getLogName() + + " pays " + payAmount + " life"); game.addEffect(new SetPowerToughnessSourceEffect(payAmount, payAmount, Duration.Custom, SubLayer.SetPT_7b), source); return true; } diff --git a/Mage.Sets/src/mage/cards/o/OpalAvenger.java b/Mage.Sets/src/mage/cards/o/OpalAvenger.java index cc28e074245..425200a714f 100644 --- a/Mage.Sets/src/mage/cards/o/OpalAvenger.java +++ b/Mage.Sets/src/mage/cards/o/OpalAvenger.java @@ -100,7 +100,7 @@ class OpalAvengerStateTriggeredAbility extends StateTriggeredAbility { @Override public String getRule() { - return new StringBuilder("When you have 10 or less life, if {this} is an enchantment, ").append(super.getRule()).toString(); + return "When you have 10 or less life, if {this} is an enchantment, " + super.getRule(); } } diff --git a/Mage.Sets/src/mage/cards/o/OrderOfSuccession.java b/Mage.Sets/src/mage/cards/o/OrderOfSuccession.java index eb366f17fe2..9633f56bb84 100644 --- a/Mage.Sets/src/mage/cards/o/OrderOfSuccession.java +++ b/Mage.Sets/src/mage/cards/o/OrderOfSuccession.java @@ -97,7 +97,7 @@ class OrderOfSuccessionEffect extends OneShotEffect { } // if player is in range he chooses a creature to control if (currentPlayer != null && game.getState().getPlayersInRange(controller.getId(), game).contains(currentPlayer.getId())) { - FilterCreaturePermanent filter = new FilterCreaturePermanent(new StringBuilder("creature controlled by ").append(nextPlayer.getLogName()).toString()); + FilterCreaturePermanent filter = new FilterCreaturePermanent("creature controlled by " + nextPlayer.getLogName()); filter.add(new ControllerIdPredicate(nextPlayer.getId())); Target target = new TargetCreaturePermanent(filter); target.setNotTarget(true); diff --git a/Mage.Sets/src/mage/cards/o/OverwhelmingInstinct.java b/Mage.Sets/src/mage/cards/o/OverwhelmingInstinct.java index cf96fd43015..183e2b38fdd 100644 --- a/Mage.Sets/src/mage/cards/o/OverwhelmingInstinct.java +++ b/Mage.Sets/src/mage/cards/o/OverwhelmingInstinct.java @@ -63,6 +63,6 @@ class OverwhelmingInstinctTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return new StringBuilder("Whenever you attack with three or more creatures, ").append(super.getRule()).toString(); + return "Whenever you attack with three or more creatures, " + super.getRule(); } } diff --git a/Mage.Sets/src/mage/cards/p/ParadoxicalOutcome.java b/Mage.Sets/src/mage/cards/p/ParadoxicalOutcome.java index 189ad55868e..daa98056f01 100644 --- a/Mage.Sets/src/mage/cards/p/ParadoxicalOutcome.java +++ b/Mage.Sets/src/mage/cards/p/ParadoxicalOutcome.java @@ -30,7 +30,7 @@ import mage.util.CardUtil; */ public final class ParadoxicalOutcome extends CardImpl { - private static FilterControlledPermanent filter = new FilterControlledPermanent(new StringBuilder("any number of of target nonland, nontoken permanents you control").toString()); + private static FilterControlledPermanent filter = new FilterControlledPermanent("any number of target nonland, nontoken permanents you control"); static { filter.add(Predicates.not(new CardTypePredicate(CardType.LAND))); @@ -107,7 +107,7 @@ class ParadoxicalOutcomeNumber implements DynamicValue { } } int number = 0; - Integer sweepNumber = (Integer) game.getState().getValue(new StringBuilder("ParadoxicalOutcomeEffect").append(source.getSourceId()).append(zoneChangeCounter).toString()); + Integer sweepNumber = (Integer) game.getState().getValue("ParadoxicalOutcomeEffect" + source.getSourceId() + zoneChangeCounter); if (sweepNumber != null) { number = sweepNumber; } diff --git a/Mage.Sets/src/mage/cards/p/PardicDragon.java b/Mage.Sets/src/mage/cards/p/PardicDragon.java index 992255a6fa9..ee175f1e669 100644 --- a/Mage.Sets/src/mage/cards/p/PardicDragon.java +++ b/Mage.Sets/src/mage/cards/p/PardicDragon.java @@ -82,7 +82,7 @@ class PardicDragonEffect extends OneShotEffect { Player opponent = game.getPlayer(getTargetPointer().getFirst(game, source)); Card sourceCard = game.getCard(source.getSourceId()); if (opponent != null && sourceCard != null) { - if (opponent.chooseUse(outcome, new StringBuilder("Put a time counter on ").append(sourceCard.getName()).append('?').toString(), source, game)) { + if (opponent.chooseUse(outcome, "Put a time counter on " + sourceCard.getName() + '?', source, game)) { sourceCard.addCounters(CounterType.TIME.createInstance(), source, game); } return true; diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianDreadnought.java b/Mage.Sets/src/mage/cards/p/PhyrexianDreadnought.java index 49daddf7619..afb9c707089 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianDreadnought.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianDreadnought.java @@ -79,7 +79,7 @@ class PhyrexianDreadnoughtSacrificeCost extends CostImpl { } } } - game.informPlayers(new StringBuilder("Sacrificed creatures with total power of ").append(sumPower).toString()); + game.informPlayers("Sacrificed creatures with total power of " + sumPower); paid = sumPower >= 12; return paid; } diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianProcessor.java b/Mage.Sets/src/mage/cards/p/PhyrexianProcessor.java index eb4d598ecf0..dc33388f9a5 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianProcessor.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianProcessor.java @@ -69,8 +69,8 @@ class PhyrexianProcessorEffect extends OneShotEffect { Card sourceCard = game.getCard(source.getSourceId()); int payAmount = controller.getAmount(0, controller.getLife(), staticText, game); controller.loseLife(payAmount, game, false); - game.informPlayers(new StringBuilder(sourceCard.getName()).append(": ").append(controller.getLogName()) - .append(" pays ").append(payAmount).append(" life.").toString()); + game.informPlayers(sourceCard.getName() + ": " + controller.getLogName() + + " pays " + payAmount + " life."); String key = CardUtil.getCardZoneString("lifePaid", source.getSourceId(), game); game.getState().setValue(key, payAmount); return true; diff --git a/Mage.Sets/src/mage/cards/p/PlagueOfVermin.java b/Mage.Sets/src/mage/cards/p/PlagueOfVermin.java index f9c188f4011..05652917b59 100644 --- a/Mage.Sets/src/mage/cards/p/PlagueOfVermin.java +++ b/Mage.Sets/src/mage/cards/p/PlagueOfVermin.java @@ -90,7 +90,7 @@ class PlagueOfVerminEffect extends OneShotEffect { payLife.put(currentPlayer.getId(), currentLifePaid + totalPaidLife); } } - game.informPlayers(new StringBuilder(sourceCard.getName()).append(": ").append(currentPlayer.getLogName()).append(" pays ").append(payLife.get(currentPlayer.getId())).append(" life").toString()); + game.informPlayers(sourceCard.getName() + ": " + currentPlayer.getLogName() + " pays " + payLife.get(currentPlayer.getId()) + " life"); firstInactivePlayer = null; } } diff --git a/Mage.Sets/src/mage/cards/p/PorphyryNodes.java b/Mage.Sets/src/mage/cards/p/PorphyryNodes.java index b8991680b04..c1321059a7e 100644 --- a/Mage.Sets/src/mage/cards/p/PorphyryNodes.java +++ b/Mage.Sets/src/mage/cards/p/PorphyryNodes.java @@ -100,7 +100,7 @@ class PorphyryNodesEffect extends OneShotEffect { } } if (permanentToDestroy != null) { - game.informPlayers(new StringBuilder(sourcePermanent.getName()).append(" chosen creature: ").append(permanentToDestroy.getName()).toString()); + game.informPlayers(sourcePermanent.getName() + " chosen creature: " + permanentToDestroy.getName()); return permanentToDestroy.destroy(source.getSourceId(), game, true); } return true; @@ -132,7 +132,7 @@ class PorphyryNodesStateTriggeredAbility extends StateTriggeredAbility { @Override public String getRule() { - return new StringBuilder("When there are no creatures on the battlefield, ").append(super.getRule()).toString() ; + return "When there are no creatures on the battlefield, " + super.getRule(); } } diff --git a/Mage.Sets/src/mage/cards/p/PowerSink.java b/Mage.Sets/src/mage/cards/p/PowerSink.java index a8e51d8e470..e8e74662efe 100644 --- a/Mage.Sets/src/mage/cards/p/PowerSink.java +++ b/Mage.Sets/src/mage/cards/p/PowerSink.java @@ -74,14 +74,14 @@ class PowerSinkCounterUnlessPaysEffect extends OneShotEffect { String sb = String.valueOf("Pay " + cost.getText()) + Character.toString('?'); if (player.chooseUse(Outcome.Benefit, sb, source, game)) { if (cost.pay(source, game, source.getSourceId(), player.getId(), false)) { - game.informPlayers(new StringBuilder(sourceObject.getName()).append(": additional cost was paid").toString()); + game.informPlayers(sourceObject.getName() + ": additional cost was paid"); return true; } } // Counter target spell unless its controller pays {X} if (game.getStack().counter(source.getFirstTarget(), source.getSourceId(), game)) { - game.informPlayers(new StringBuilder(sourceObject.getName()).append(": additional cost wasn't paid - countering ").append(spell.getName()).toString()); + game.informPlayers(sourceObject.getName() + ": additional cost wasn't paid - countering " + spell.getName()); } // that player taps all lands with mana abilities he or she controls... diff --git a/Mage.Sets/src/mage/cards/p/PredatoryAdvantage.java b/Mage.Sets/src/mage/cards/p/PredatoryAdvantage.java index fe202bc1e04..01c526c4085 100644 --- a/Mage.Sets/src/mage/cards/p/PredatoryAdvantage.java +++ b/Mage.Sets/src/mage/cards/p/PredatoryAdvantage.java @@ -58,8 +58,7 @@ class DidNotCastCreatureCondition implements Condition { @Override public String toString() { - StringBuilder sb = new StringBuilder("if that player didn't cast a creature spell this turn"); - return sb.toString(); + return "if that player didn't cast a creature spell this turn"; } } diff --git a/Mage.Sets/src/mage/cards/p/PurgingScythe.java b/Mage.Sets/src/mage/cards/p/PurgingScythe.java index 9ffa9791dd3..17b15d25afb 100644 --- a/Mage.Sets/src/mage/cards/p/PurgingScythe.java +++ b/Mage.Sets/src/mage/cards/p/PurgingScythe.java @@ -92,7 +92,7 @@ class PurgingScytheEffect extends OneShotEffect { } } if (permanentToDamage != null) { - game.informPlayers(new StringBuilder(sourcePermanent.getName()).append(" chosen creature: ").append(permanentToDamage.getName()).toString()); + game.informPlayers(sourcePermanent.getName() + " chosen creature: " + permanentToDamage.getName()); return permanentToDamage.damage(2, source.getSourceId(), game, false, true) > 0; } return true; diff --git a/Mage.Sets/src/mage/cards/r/Repeal.java b/Mage.Sets/src/mage/cards/r/Repeal.java index 9738ab88b24..b03390c18d9 100644 --- a/Mage.Sets/src/mage/cards/r/Repeal.java +++ b/Mage.Sets/src/mage/cards/r/Repeal.java @@ -40,7 +40,7 @@ public final class Repeal extends CardImpl { if (ability instanceof SpellAbility) { ability.getTargets().clear(); int xValue = ability.getManaCostsToPay().getX(); - FilterNonlandPermanent filter = new FilterNonlandPermanent(new StringBuilder("nonland permanent with converted mana cost ").append(xValue).toString()); + FilterNonlandPermanent filter = new FilterNonlandPermanent("nonland permanent with converted mana cost " + xValue); filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, xValue)); ability.addTarget(new TargetNonlandPermanent(filter)); } diff --git a/Mage.Sets/src/mage/cards/r/ReverseTheSands.java b/Mage.Sets/src/mage/cards/r/ReverseTheSands.java index e32829e1042..1744c1194d9 100644 --- a/Mage.Sets/src/mage/cards/r/ReverseTheSands.java +++ b/Mage.Sets/src/mage/cards/r/ReverseTheSands.java @@ -63,7 +63,7 @@ class ReverseTheSandsEffect extends OneShotEffect { for (UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)) { Player player = game.getPlayer(playerId); if (player != null) { - choices.add(new StringBuilder(Integer.toString(player.getLife())).append(" life of ").append(player.getLogName()).toString()); + choices.add(Integer.toString(player.getLife()) + " life of " + player.getLogName()); } } lifeChoice.setChoices(choices); diff --git a/Mage.Sets/src/mage/cards/r/Riftsweeper.java b/Mage.Sets/src/mage/cards/r/Riftsweeper.java index bdbba5d46f8..050ee181043 100644 --- a/Mage.Sets/src/mage/cards/r/Riftsweeper.java +++ b/Mage.Sets/src/mage/cards/r/Riftsweeper.java @@ -79,7 +79,7 @@ class RiftsweeperEffect extends OneShotEffect { // move to exile card.moveToZone(Zone.LIBRARY, source.getSourceId(), game, true); game.getPlayer(card.getOwnerId()).shuffleLibrary(source, game); - game.informPlayers(new StringBuilder("Riftsweeper: Choosen card was ").append(card.getName()).toString()); + game.informPlayers("Riftsweeper: Choosen card was " + card.getName()); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/r/RithTheAwakener.java b/Mage.Sets/src/mage/cards/r/RithTheAwakener.java index 3441c4f45ca..39e300e3670 100644 --- a/Mage.Sets/src/mage/cards/r/RithTheAwakener.java +++ b/Mage.Sets/src/mage/cards/r/RithTheAwakener.java @@ -78,7 +78,7 @@ class RithTheAwakenerEffect extends OneShotEffect { } ChoiceColor choice = new ChoiceColor(); if (controller.choose(outcome, choice, game)) { - game.informPlayers(new StringBuilder(controller.getLogName()).append(" chooses ").append(choice.getColor()).toString()); + game.informPlayers(controller.getLogName() + " chooses " + choice.getColor()); FilterPermanent filter = new FilterPermanent(); filter.add(new ColorPredicate(choice.getColor())); int cardsWithColor = game.getBattlefield().count(filter, source.getSourceId(), controller.getId(), game); diff --git a/Mage.Sets/src/mage/cards/s/SageOfHours.java b/Mage.Sets/src/mage/cards/s/SageOfHours.java index e5a9fe5eac4..ba80bfe4279 100644 --- a/Mage.Sets/src/mage/cards/s/SageOfHours.java +++ b/Mage.Sets/src/mage/cards/s/SageOfHours.java @@ -127,11 +127,11 @@ class SageOfHoursEffect extends OneShotEffect { for (int i = 0; i < turns; i++) { game.getState().getTurnMods().add(new TurnMod(player.getId(), false)); } - game.informPlayers(new StringBuilder("Removed ").append(countersRemoved) - .append(" +1/+1 counters: ").append(player.getLogName()).append(" takes ") - .append(CardUtil.numberToText(turns, "an")) - .append(turns > 1 ? " extra turns ":" extra turn ") - .append("after this one").toString()); + game.informPlayers("Removed " + countersRemoved + + " +1/+1 counters: " + player.getLogName() + " takes " + + CardUtil.numberToText(turns, "an") + + (turns > 1 ? " extra turns " : " extra turn ") + + "after this one"); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/s/SatyrFiredancer.java b/Mage.Sets/src/mage/cards/s/SatyrFiredancer.java index 3db3ccfc6d4..107565da511 100644 --- a/Mage.Sets/src/mage/cards/s/SatyrFiredancer.java +++ b/Mage.Sets/src/mage/cards/s/SatyrFiredancer.java @@ -120,7 +120,7 @@ class SatyrFiredancerTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return new StringBuilder("Whenever an instant or sorcery spell you control deals damage to an opponent, ").append(super.getRule()).toString(); + return "Whenever an instant or sorcery spell you control deals damage to an opponent, " + super.getRule(); } } diff --git a/Mage.Sets/src/mage/cards/s/SavageSummoning.java b/Mage.Sets/src/mage/cards/s/SavageSummoning.java index df81be34d65..e92658aa331 100644 --- a/Mage.Sets/src/mage/cards/s/SavageSummoning.java +++ b/Mage.Sets/src/mage/cards/s/SavageSummoning.java @@ -148,7 +148,7 @@ class SavageSummoningWatcher extends Watcher { Spell spell = game.getStack().getSpell(event.getTargetId()); if (spell != null && spell.isCreature()) { spellsCastWithSavageSummoning.put(spell.getId(), new HashSet<>(savageSummoningSpells)); - String cardKey = new StringBuilder(spell.getCard().getId().toString()).append('_').append(spell.getCard().getZoneChangeCounter(game)).toString(); + String cardKey = spell.getCard().getId().toString() + '_' + spell.getCard().getZoneChangeCounter(game); cardsCastWithSavageSummoning.put(cardKey, new HashSet<>(savageSummoningSpells)); savageSummoningSpells.clear(); } @@ -157,7 +157,7 @@ class SavageSummoningWatcher extends Watcher { } public void setSavageSummoningSpellActive(Card card, Game game) { - String cardKey = new StringBuilder(card.getId().toString()).append('_').append(card.getZoneChangeCounter(game)).toString(); + String cardKey = card.getId().toString() + '_' + card.getZoneChangeCounter(game); savageSummoningSpells.add(cardKey); } @@ -166,7 +166,7 @@ class SavageSummoningWatcher extends Watcher { } public boolean isSpellCastWithThisSavageSummoning(UUID spellId, UUID cardId, int zoneChangeCounter) { - String cardKey = new StringBuilder(cardId.toString()).append('_').append(zoneChangeCounter).toString(); + String cardKey = cardId.toString() + '_' + zoneChangeCounter; Set savageSpells = spellsCastWithSavageSummoning.get(spellId); return savageSpells != null && savageSpells.contains(cardKey); } diff --git a/Mage.Sets/src/mage/cards/s/ScoutsWarning.java b/Mage.Sets/src/mage/cards/s/ScoutsWarning.java index 5ddb9e6c3a5..0c1816f4a34 100644 --- a/Mage.Sets/src/mage/cards/s/ScoutsWarning.java +++ b/Mage.Sets/src/mage/cards/s/ScoutsWarning.java @@ -126,12 +126,12 @@ class ScoutsWarningWatcher extends Watcher { } public void addScoutsWarningSpell(UUID sourceId, int zoneChangeCounter) { - String spellKey = new StringBuilder(sourceId.toString()).append('_').append(zoneChangeCounter).toString(); + String spellKey = sourceId.toString() + '_' + zoneChangeCounter; activeScoutsWarningSpells.add(spellKey); } public boolean isScoutsWarningSpellActive(UUID sourceId, int zoneChangeCounter) { - String spellKey = new StringBuilder(sourceId.toString()).append('_').append(zoneChangeCounter).toString(); + String spellKey = sourceId.toString() + '_' + zoneChangeCounter; return activeScoutsWarningSpells.contains(spellKey); } diff --git a/Mage.Sets/src/mage/cards/s/SharedTrauma.java b/Mage.Sets/src/mage/cards/s/SharedTrauma.java index b8b9eb8e533..b20a0a7bc18 100644 --- a/Mage.Sets/src/mage/cards/s/SharedTrauma.java +++ b/Mage.Sets/src/mage/cards/s/SharedTrauma.java @@ -99,7 +99,7 @@ class SharedTraumaEffect extends OneShotEffect { payed = true; } } - game.informPlayers(new StringBuilder(player.getLogName()).append(" pays {").append(xValue).append("}.").toString()); + game.informPlayers(player.getLogName() + " pays {" + xValue + "}."); return xValue; } } diff --git a/Mage.Sets/src/mage/cards/s/ShatteredCrypt.java b/Mage.Sets/src/mage/cards/s/ShatteredCrypt.java index a2c22cc7bfd..340152cd769 100644 --- a/Mage.Sets/src/mage/cards/s/ShatteredCrypt.java +++ b/Mage.Sets/src/mage/cards/s/ShatteredCrypt.java @@ -38,7 +38,7 @@ public final class ShatteredCrypt extends CardImpl { if (ability instanceof SpellAbility) { ability.getTargets().clear(); int xValue = ability.getManaCostsToPay().getX(); - Target target = new TargetCardInYourGraveyard(xValue, new FilterCreatureCard(new StringBuilder(xValue).append(xValue != 1 ? " creature cards" : "creature card").append(" from your graveyard").toString())); + Target target = new TargetCardInYourGraveyard(xValue, new FilterCreatureCard((xValue != 1 ? " creature cards" : "creature card") + " from your graveyard")); ability.addTarget(target); } } diff --git a/Mage.Sets/src/mage/cards/s/ShattergangBrothers.java b/Mage.Sets/src/mage/cards/s/ShattergangBrothers.java index 73ea093e0d3..2db55d0a3c5 100644 --- a/Mage.Sets/src/mage/cards/s/ShattergangBrothers.java +++ b/Mage.Sets/src/mage/cards/s/ShattergangBrothers.java @@ -75,7 +75,7 @@ class ShattergangBrothersEffect extends OneShotEffect { public ShattergangBrothersEffect(FilterControlledPermanent filter) { super(Outcome.Sacrifice); this.filter = filter; - this.staticText = new StringBuilder("Each other player sacrifices ").append(filter.getMessage()).toString(); + this.staticText = "Each other player sacrifices " + filter.getMessage(); } public ShattergangBrothersEffect(final ShattergangBrothersEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/ShieldOfTheAvatar.java b/Mage.Sets/src/mage/cards/s/ShieldOfTheAvatar.java index a56fda75969..fc8c6cfb445 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldOfTheAvatar.java +++ b/Mage.Sets/src/mage/cards/s/ShieldOfTheAvatar.java @@ -88,7 +88,7 @@ class ShieldOfTheAvatarPreventionEffect extends PreventionEffectImpl { result = true; } if (toPrevent > 0) { - game.informPlayers(new StringBuilder("Shield of the Avatar ").append("prevented ").append(toPrevent).append(" damage to ").append(game.getPermanent(equipment.getAttachedTo()).getName()).toString()); + game.informPlayers("Shield of the Avatar " + "prevented " + toPrevent + " damage to " + game.getPermanent(equipment.getAttachedTo()).getName()); game.fireEvent(GameEvent.getEvent(GameEvent.EventType.PREVENTED_DAMAGE, equipment.getAttachedTo(), source.getSourceId(), source.getControllerId(), toPrevent)); } diff --git a/Mage.Sets/src/mage/cards/s/SigilCaptain.java b/Mage.Sets/src/mage/cards/s/SigilCaptain.java index e14f9428f69..0e5408a88ab 100644 --- a/Mage.Sets/src/mage/cards/s/SigilCaptain.java +++ b/Mage.Sets/src/mage/cards/s/SigilCaptain.java @@ -87,8 +87,6 @@ class SigilCaptainTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - StringBuilder sb = new StringBuilder(); - sb.append("Whenever a creature enters the battlefield under your control, if that creature is 1/1, put two +1/+1 counters on it"); - return sb.toString(); + return "Whenever a creature enters the battlefield under your control, if that creature is 1/1, put two +1/+1 counters on it"; } } diff --git a/Mage.Sets/src/mage/cards/s/SkyfireKirin.java b/Mage.Sets/src/mage/cards/s/SkyfireKirin.java index ab3981c926c..03b12415075 100644 --- a/Mage.Sets/src/mage/cards/s/SkyfireKirin.java +++ b/Mage.Sets/src/mage/cards/s/SkyfireKirin.java @@ -56,7 +56,7 @@ public final class SkyfireKirin extends CardImpl { if (spell != null) { int cmc = spell.getConvertedManaCost(); ability.getTargets().clear(); - FilterPermanent filter = new FilterCreaturePermanent(new StringBuilder("creature with converted mana costs of ").append(cmc).toString()); + FilterPermanent filter = new FilterCreaturePermanent("creature with converted mana costs of " + cmc); filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, cmc)); Target target = new TargetPermanent(filter); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/s/SoulSeizer.java b/Mage.Sets/src/mage/cards/s/SoulSeizer.java index f578200ea02..c525664df3a 100644 --- a/Mage.Sets/src/mage/cards/s/SoulSeizer.java +++ b/Mage.Sets/src/mage/cards/s/SoulSeizer.java @@ -115,7 +115,7 @@ class SoulSeizerEffect extends OneShotEffect { Permanent permanent = game.getPermanent(source.getSourceId()); if (permanent != null && permanent.isTransformable()) { if (permanent.transform(game)) { - game.informPlayers(new StringBuilder(permanent.getName()).append(" transforms into ").append(permanent.getSecondCardFace().getName()).toString()); + game.informPlayers(permanent.getName() + " transforms into " + permanent.getSecondCardFace().getName()); Permanent attachTo = game.getPermanent(targetPointer.getFirst(game, source)); if (attachTo != null) { return attachTo.addAttachment(source.getSourceId(), game); diff --git a/Mage.Sets/src/mage/cards/s/SpellBlast.java b/Mage.Sets/src/mage/cards/s/SpellBlast.java index 36a131fdb2c..c1e3b3c7efa 100644 --- a/Mage.Sets/src/mage/cards/s/SpellBlast.java +++ b/Mage.Sets/src/mage/cards/s/SpellBlast.java @@ -46,7 +46,7 @@ public final class SpellBlast extends CardImpl { if (ability instanceof SpellAbility) { int xValue = ability.getManaCostsToPay().getX(); ability.getTargets().clear(); - FilterSpell newfilter = new FilterSpell(new StringBuilder("spell with converted mana cost ").append(xValue).toString()); + FilterSpell newfilter = new FilterSpell("spell with converted mana cost " + xValue); newfilter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, xValue)); Target target = new TargetSpell(newfilter); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/s/SpellRupture.java b/Mage.Sets/src/mage/cards/s/SpellRupture.java index 2be94526f51..81470aec9c5 100644 --- a/Mage.Sets/src/mage/cards/s/SpellRupture.java +++ b/Mage.Sets/src/mage/cards/s/SpellRupture.java @@ -76,7 +76,7 @@ class SpellRuptureCounterUnlessPaysEffect extends OneShotEffect { } if (!cost.isPaid()) { if (game.getStack().counter(source.getFirstTarget(), source.getSourceId(), game)) { - game.informPlayers(new StringBuilder(sourceObject.getName()).append(": cost wasn't payed - countering ").append(spell.getName()).toString()); + game.informPlayers(sourceObject.getName() + ": cost wasn't payed - countering " + spell.getName()); return true; } } diff --git a/Mage.Sets/src/mage/cards/s/Spellbinder.java b/Mage.Sets/src/mage/cards/s/Spellbinder.java index 4782c704a00..bdedc54d136 100644 --- a/Mage.Sets/src/mage/cards/s/Spellbinder.java +++ b/Mage.Sets/src/mage/cards/s/Spellbinder.java @@ -165,7 +165,7 @@ class SpellbinderCopyEffect extends OneShotEffect { if (spellbinder != null && spellbinder.getImprinted() != null && !spellbinder.getImprinted().isEmpty()) { Card imprintedInstant = game.getCard(spellbinder.getImprinted().get(0)); if (imprintedInstant != null && game.getState().getZone(imprintedInstant.getId()) == Zone.EXILED) { - if (controller.chooseUse(outcome, new StringBuilder("Create a copy of ").append(imprintedInstant.getName()).append('?').toString(), source, game)) { + if (controller.chooseUse(outcome, "Create a copy of " + imprintedInstant.getName() + '?', source, game)) { Card copiedCard = game.copyCard(imprintedInstant, source, source.getControllerId()); if (copiedCard != null) { game.getExile().add(source.getSourceId(), "", copiedCard); diff --git a/Mage.Sets/src/mage/cards/s/SpellstutterSprite.java b/Mage.Sets/src/mage/cards/s/SpellstutterSprite.java index 2bfc12b77dd..9c63519a992 100644 --- a/Mage.Sets/src/mage/cards/s/SpellstutterSprite.java +++ b/Mage.Sets/src/mage/cards/s/SpellstutterSprite.java @@ -57,7 +57,7 @@ public final class SpellstutterSprite extends CardImpl { public void adjustTargets(Ability ability, Game game) { if (ability instanceof EntersBattlefieldTriggeredAbility) { int numberFaeries = game.getState().getBattlefield().countAll(filter, ability.getControllerId(), game); - FilterSpell xFilter = new FilterSpell(new StringBuilder("spell with converted mana cost ").append(numberFaeries).append(" or less").toString()); + FilterSpell xFilter = new FilterSpell("spell with converted mana cost " + numberFaeries + " or less"); xFilter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, numberFaeries + 1)); ability.getTargets().clear(); ability.addTarget(new TargetSpell(xFilter)); diff --git a/Mage.Sets/src/mage/cards/s/SpitefulReturned.java b/Mage.Sets/src/mage/cards/s/SpitefulReturned.java index 3bca683888a..2d80ec8660e 100644 --- a/Mage.Sets/src/mage/cards/s/SpitefulReturned.java +++ b/Mage.Sets/src/mage/cards/s/SpitefulReturned.java @@ -98,6 +98,6 @@ class SpitefulReturnedTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return new StringBuilder("Whenever {this} or enchanted creature attacks, ").append(super.getRule()).toString(); + return "Whenever {this} or enchanted creature attacks, " + super.getRule(); } } diff --git a/Mage.Sets/src/mage/cards/s/StandOrFall.java b/Mage.Sets/src/mage/cards/s/StandOrFall.java index 923722f51b4..fcfe434040a 100644 --- a/Mage.Sets/src/mage/cards/s/StandOrFall.java +++ b/Mage.Sets/src/mage/cards/s/StandOrFall.java @@ -122,9 +122,7 @@ class StandOrFallEffect extends OneShotEffect { game.addEffect(effect, source); } } - StringBuilder sb = new StringBuilder("Creatures that can block this turn: "); - sb.append(otherPile.stream().map(Permanent::getLogName).collect(Collectors.joining(", "))); - game.informPlayers(sb.toString()); + game.informPlayers("Creatures that can block this turn: " + otherPile.stream().map(Permanent::getLogName).collect(Collectors.joining(", "))); return true; } } diff --git a/Mage.Sets/src/mage/cards/s/StonewiseFortifier.java b/Mage.Sets/src/mage/cards/s/StonewiseFortifier.java index 54bd8c97085..67848f60fa3 100644 --- a/Mage.Sets/src/mage/cards/s/StonewiseFortifier.java +++ b/Mage.Sets/src/mage/cards/s/StonewiseFortifier.java @@ -77,10 +77,10 @@ class StonewiseFortifierPreventAllDamageToEffect extends PreventionEffectImpl { MageObject damageSource = game.getObject(event.getSourceId()); MageObject preventionSource = game.getObject(source.getSourceId()); if (damageSource != null && preventionSource != null) { - StringBuilder message = new StringBuilder(preventedDamage).append(" damage from "); - message.append(damageSource.getName()).append(" prevented "); - message.append('(').append(preventionSource).append(')'); - game.informPlayers(message.toString()); + String message = " damage from " + + damageSource.getName() + " prevented " + + '(' + preventionSource + ')'; + game.informPlayers(message); } event.setAmount(0); game.fireEvent(GameEvent.getEvent(GameEvent.EventType.PREVENTED_DAMAGE, event.getTargetId(), source.getSourceId(), source.getControllerId(), preventedDamage)); diff --git a/Mage.Sets/src/mage/cards/s/StrionicResonator.java b/Mage.Sets/src/mage/cards/s/StrionicResonator.java index 0c587fb0864..e6ffbba49a6 100644 --- a/Mage.Sets/src/mage/cards/s/StrionicResonator.java +++ b/Mage.Sets/src/mage/cards/s/StrionicResonator.java @@ -78,8 +78,6 @@ class StrionicResonatorEffect extends OneShotEffect { @Override public String getText(Mode mode) { - StringBuilder sb = new StringBuilder(); - sb.append("Copy ").append(mode.getTargets().get(0).getTargetName()).append(". You may choose new targets for the copy"); - return sb.toString(); + return "Copy " + mode.getTargets().get(0).getTargetName() + ". You may choose new targets for the copy"; } } diff --git a/Mage.Sets/src/mage/cards/s/StromkirkOccultist.java b/Mage.Sets/src/mage/cards/s/StromkirkOccultist.java index ff3405bd2a5..66f4c3618cc 100644 --- a/Mage.Sets/src/mage/cards/s/StromkirkOccultist.java +++ b/Mage.Sets/src/mage/cards/s/StromkirkOccultist.java @@ -81,7 +81,7 @@ class StromkirkOccultistExileEffect extends OneShotEffect { if (sourcePermanent != null && controller != null && controller.getLibrary().hasCards()) { Card card = controller.getLibrary().getFromTop(game); if (card != null) { - String exileName = new StringBuilder(sourcePermanent.getIdName()).append(" ").toString(); + String exileName = sourcePermanent.getIdName() + " "; if (controller.moveCardToExileWithInfo(card, source.getSourceId(), exileName, source.getSourceId(), game, Zone.LIBRARY, true)) { ContinuousEffect effect = new StromkirkOccultistPlayFromExileEffect(); effect.setTargetPointer(new FixedTarget(card.getId())); diff --git a/Mage.Sets/src/mage/cards/s/SurveyorsScope.java b/Mage.Sets/src/mage/cards/s/SurveyorsScope.java index aa0c1ee5501..a3c878d150e 100644 --- a/Mage.Sets/src/mage/cards/s/SurveyorsScope.java +++ b/Mage.Sets/src/mage/cards/s/SurveyorsScope.java @@ -74,7 +74,7 @@ class SurveyorsScopeEffect extends OneShotEffect { } } } - game.informPlayers(new StringBuilder("Surveyor's Scope: X = ").append(numberOfLands).toString()); + game.informPlayers("Surveyor's Scope: X = " + numberOfLands); // 10/17/2013 If no players control at least two more lands than you when the ability resolves, you'll still search and shuffle your library. return new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, numberOfLands, StaticFilters.FILTER_CARD_BASIC_LAND)).apply(game, source); } diff --git a/Mage.Sets/src/mage/cards/t/TaintedPact.java b/Mage.Sets/src/mage/cards/t/TaintedPact.java index 211aea5fcdc..bed54772362 100644 --- a/Mage.Sets/src/mage/cards/t/TaintedPact.java +++ b/Mage.Sets/src/mage/cards/t/TaintedPact.java @@ -73,7 +73,7 @@ class TaintedPactEffect extends OneShotEffect{ break; } names.add(card.getName()); - if (player.chooseUse(outcome, new StringBuilder("Put ").append(card.getName()).append("into your hand?").toString(), source, game)) { + if (player.chooseUse(outcome, "Put " + card.getName() + "into your hand?", source, game)) { //Adds the current card to hand if it is chosen. card.moveToZone(Zone.HAND, source.getSourceId(), game, true); break; diff --git a/Mage.Sets/src/mage/cards/t/TalusPaladin.java b/Mage.Sets/src/mage/cards/t/TalusPaladin.java index e1bd393fefe..65280dc6d68 100644 --- a/Mage.Sets/src/mage/cards/t/TalusPaladin.java +++ b/Mage.Sets/src/mage/cards/t/TalusPaladin.java @@ -113,9 +113,8 @@ class TalusPaladinEffect extends OneShotEffect { Player player = game.getPlayer(source.getControllerId()); Permanent taluspPaladin = game.getPermanent(source.getSourceId()); if (taluspPaladin != null && player != null) { - StringBuilder sb = new StringBuilder(); - sb.append("Put a +1/+1 counter on Talus Paladin?"); - if (!player.chooseUse(Outcome.Benefit, sb.toString(), source, game)) { + String question = "Put a +1/+1 counter on Talus Paladin?"; + if (!player.chooseUse(Outcome.Benefit, question, source, game)) { return false; } taluspPaladin.addCounters(CounterType.P1P1.createInstance(), source, game); diff --git a/Mage.Sets/src/mage/cards/t/Tariff.java b/Mage.Sets/src/mage/cards/t/Tariff.java index 2f2d3b5a2de..04ca7709ae7 100644 --- a/Mage.Sets/src/mage/cards/t/Tariff.java +++ b/Mage.Sets/src/mage/cards/t/Tariff.java @@ -96,8 +96,7 @@ class TariffEffect extends OneShotEffect { } } - game.informPlayers(new StringBuilder(sourceObject != null ? sourceObject.getName() : "") - .append(": ").append(player.getLogName()).append(" hasn't paid").toString()); + game.informPlayers(sourceObject.getName() + ": " + player.getLogName() + " hasn't paid"); creatureToPayFor.sacrifice(source.getSourceId(), game); } } diff --git a/Mage.Sets/src/mage/cards/t/TaskMageAssembly.java b/Mage.Sets/src/mage/cards/t/TaskMageAssembly.java index 1eb857cb958..d1e5947df39 100644 --- a/Mage.Sets/src/mage/cards/t/TaskMageAssembly.java +++ b/Mage.Sets/src/mage/cards/t/TaskMageAssembly.java @@ -71,7 +71,7 @@ class TaskMageAssemblyStateTriggeredAbility extends StateTriggeredAbility { @Override public String getRule() { - return new StringBuilder("When there are no creatures on the battlefield, ").append(super.getRule()).toString() ; + return "When there are no creatures on the battlefield, " + super.getRule(); } } diff --git a/Mage.Sets/src/mage/cards/t/Temper.java b/Mage.Sets/src/mage/cards/t/Temper.java index 7c02c03ebec..602872e0853 100644 --- a/Mage.Sets/src/mage/cards/t/Temper.java +++ b/Mage.Sets/src/mage/cards/t/Temper.java @@ -98,7 +98,7 @@ class TemperPreventDamageTargetEffect extends PreventionEffectImpl { Permanent targetPermanent = game.getPermanent(source.getTargets().getFirstTarget()); if (targetPermanent != null) { targetPermanent.addCounters(CounterType.P1P1.createInstance(prevented), source, game); - game.informPlayers(new StringBuilder("Temper: Prevented ").append(prevented).append(" damage ").toString()); + game.informPlayers("Temper: Prevented " + prevented + " damage "); game.informPlayers("Temper: Adding " + prevented + " +1/+1 counters to " + targetPermanent.getName()); } } diff --git a/Mage.Sets/src/mage/cards/t/TemptWithReflections.java b/Mage.Sets/src/mage/cards/t/TemptWithReflections.java index c1ea128beb9..7c644e6bd03 100644 --- a/Mage.Sets/src/mage/cards/t/TemptWithReflections.java +++ b/Mage.Sets/src/mage/cards/t/TemptWithReflections.java @@ -79,7 +79,7 @@ class TemptWithReflectionsEffect extends OneShotEffect { } else { decision = " won't copy "; } - game.informPlayers((new StringBuilder(player.getLogName()).append(decision).append(permanent.getName()).toString())); + game.informPlayers((player.getLogName() + decision + permanent.getName())); } player = playerList.getNext(game); } while (!player.getId().equals(game.getActivePlayerId())); diff --git a/Mage.Sets/src/mage/cards/t/TestOfFaith.java b/Mage.Sets/src/mage/cards/t/TestOfFaith.java index 62af94a72eb..4314b4dea39 100644 --- a/Mage.Sets/src/mage/cards/t/TestOfFaith.java +++ b/Mage.Sets/src/mage/cards/t/TestOfFaith.java @@ -86,7 +86,7 @@ class TestOfFaithPreventDamageTargetEffect extends PreventionEffectImpl { Permanent targetPermanent = game.getPermanent(source.getTargets().getFirstTarget()); if (targetPermanent != null) { targetPermanent.addCounters(CounterType.P1P1.createInstance(prevented), source, game); - game.informPlayers(new StringBuilder("Test of Faith: Prevented ").append(prevented).append(" damage ").toString()); + game.informPlayers("Test of Faith: Prevented " + prevented + " damage "); game.informPlayers("Test of Faith: Adding " + prevented + " +1/+1 counters to " + targetPermanent.getName()); } } diff --git a/Mage.Sets/src/mage/cards/t/ThoughtPrison.java b/Mage.Sets/src/mage/cards/t/ThoughtPrison.java index 7eef4e4083c..825e82e0844 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtPrison.java +++ b/Mage.Sets/src/mage/cards/t/ThoughtPrison.java @@ -94,7 +94,7 @@ class ThoughtPrisonImprintEffect extends OneShotEffect { Permanent permanent = game.getPermanent(source.getSourceId()); if (permanent != null) { permanent.imprint(card.getId(), game); - permanent.addInfo("imprint", new StringBuilder("[Exiled card - ").append(card.getName()).append(']').toString(), game); + permanent.addInfo("imprint", "[Exiled card - " + card.getName() + ']', game); } return true; } diff --git a/Mage.Sets/src/mage/cards/t/TideOfWar.java b/Mage.Sets/src/mage/cards/t/TideOfWar.java index 3cc8d25e62a..772b8c800d8 100644 --- a/Mage.Sets/src/mage/cards/t/TideOfWar.java +++ b/Mage.Sets/src/mage/cards/t/TideOfWar.java @@ -124,7 +124,7 @@ class TideOfWarEffect extends OneShotEffect { creature.sacrifice(source.getSourceId(), game); Player player = game.getPlayer(creature.getControllerId()); if (player != null) { - game.informPlayers(new StringBuilder(player.getLogName()).append(" sacrifices ").append(creature.getName()).toString()); + game.informPlayers(player.getLogName() + " sacrifices " + creature.getName()); } } } diff --git a/Mage.Sets/src/mage/cards/t/ToilsOfNightAndDay.java b/Mage.Sets/src/mage/cards/t/ToilsOfNightAndDay.java index e01e8be6c23..7935690413d 100644 --- a/Mage.Sets/src/mage/cards/t/ToilsOfNightAndDay.java +++ b/Mage.Sets/src/mage/cards/t/ToilsOfNightAndDay.java @@ -64,9 +64,9 @@ public final class ToilsOfNightAndDay extends CardImpl { for (UUID targetId : source.getTargets().get(0).getTargets()) { Permanent permanent = game.getPermanent(targetId); if (permanent != null) { - if (player.chooseUse(Outcome.Tap, new StringBuilder("Tap ").append(permanent.getName()).append('?').toString(), source, game)) { + if (player.chooseUse(Outcome.Tap, "Tap " + permanent.getName() + '?', source, game)) { permanent.tap(game); - } else if (player.chooseUse(Outcome.Untap, new StringBuilder("Untap ").append(permanent.getName()).append('?').toString(), source, game)) { + } else if (player.chooseUse(Outcome.Untap, "Untap " + permanent.getName() + '?', source, game)) { permanent.untap(game); } } diff --git a/Mage.Sets/src/mage/cards/t/TrespassersCurse.java b/Mage.Sets/src/mage/cards/t/TrespassersCurse.java index 1caf05620ec..7e84ea248e4 100644 --- a/Mage.Sets/src/mage/cards/t/TrespassersCurse.java +++ b/Mage.Sets/src/mage/cards/t/TrespassersCurse.java @@ -86,7 +86,7 @@ class TrespassersCurseTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return new StringBuilder("Whenever a creature enters the battlefield under enchanted player's control, ").append(super.getRule()).toString(); + return "Whenever a creature enters the battlefield under enchanted player's control, " + super.getRule(); } @Override diff --git a/Mage.Sets/src/mage/cards/t/TrevaTheRenewer.java b/Mage.Sets/src/mage/cards/t/TrevaTheRenewer.java index 67c34ed9bb5..4134a6ffbf1 100644 --- a/Mage.Sets/src/mage/cards/t/TrevaTheRenewer.java +++ b/Mage.Sets/src/mage/cards/t/TrevaTheRenewer.java @@ -75,7 +75,7 @@ class TrevaTheRenewerEffect extends OneShotEffect { } ChoiceColor choice = new ChoiceColor(); if (controller.choose(outcome, choice, game)) { - game.informPlayers(new StringBuilder(controller.getLogName()).append(" chooses ").append(choice.getColor()).toString()); + game.informPlayers(controller.getLogName() + " chooses " + choice.getColor()); FilterPermanent filter = new FilterPermanent(); filter.add(new ColorPredicate(choice.getColor())); int cardsWithColor = game.getBattlefield().count(filter, source.getSourceId(), controller.getId(), game); diff --git a/Mage.Sets/src/mage/cards/t/TritonTactics.java b/Mage.Sets/src/mage/cards/t/TritonTactics.java index 1823c39c192..573c6b6a705 100644 --- a/Mage.Sets/src/mage/cards/t/TritonTactics.java +++ b/Mage.Sets/src/mage/cards/t/TritonTactics.java @@ -164,7 +164,7 @@ class TritonTacticsEndOfCombatEffect extends OneShotEffect { // tap creature and add the not untap effect creature.tap(game); doNotUntapNextUntapStep.add(creature); - game.informPlayers(new StringBuilder("Triton Tactics: ").append(creature.getName()).append(" doesn't untap during its controller's next untap step").toString()); + game.informPlayers("Triton Tactics: " + creature.getName() + " doesn't untap during its controller's next untap step"); } } if (!doNotUntapNextUntapStep.isEmpty()) { diff --git a/Mage.Sets/src/mage/cards/u/UneshCriosphinxSovereign.java b/Mage.Sets/src/mage/cards/u/UneshCriosphinxSovereign.java index 392d9c4ffb7..de1230006ad 100644 --- a/Mage.Sets/src/mage/cards/u/UneshCriosphinxSovereign.java +++ b/Mage.Sets/src/mage/cards/u/UneshCriosphinxSovereign.java @@ -108,7 +108,7 @@ class UneshCriosphinxSovereignTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return new StringBuilder("Whenever {this} or another Sphinx enters the battlefield under your control, ").append(super.getRule()).toString(); + return "Whenever {this} or another Sphinx enters the battlefield under your control, " + super.getRule(); } @Override diff --git a/Mage.Sets/src/mage/cards/u/UnexpectedResults.java b/Mage.Sets/src/mage/cards/u/UnexpectedResults.java index c7c062ec942..6a879dbdfd1 100644 --- a/Mage.Sets/src/mage/cards/u/UnexpectedResults.java +++ b/Mage.Sets/src/mage/cards/u/UnexpectedResults.java @@ -100,7 +100,7 @@ class UnexpectedResultEffect extends OneShotEffect { return true; } } else { - if (controller.chooseUse(outcome, new StringBuilder("Cast ").append(card.getName()).append(" without paying its mana cost?").toString(), source, game)) { + if (controller.chooseUse(outcome, "Cast " + card.getName() + " without paying its mana cost?", source, game)) { return controller.cast(card.getSpellAbility(), game, true, new MageObjectReference(source.getSourceObject(game), game)); } } diff --git a/Mage.Sets/src/mage/cards/v/VectisDominator.java b/Mage.Sets/src/mage/cards/v/VectisDominator.java index b2b966c541d..22deeb8810c 100644 --- a/Mage.Sets/src/mage/cards/v/VectisDominator.java +++ b/Mage.Sets/src/mage/cards/v/VectisDominator.java @@ -77,8 +77,8 @@ class VectisDominatorEffect extends OneShotEffect { Player player = game.getPlayer(targetCreature.getControllerId()); if (player != null) { cost.clearPaid(); - final StringBuilder sb = new StringBuilder("Pay 2 life? (Otherwise ").append(targetCreature.getName()).append(" will be tapped)"); - if (player.chooseUse(Outcome.Benefit, sb.toString(), source, game)) { + String question = "Pay 2 life? (Otherwise " + targetCreature.getName()+" will be tapped)"; + if (player.chooseUse(Outcome.Benefit, question, source, game)) { cost.pay(source, game, targetCreature.getControllerId(), targetCreature.getControllerId(), true, null); } if (!cost.isPaid()) { diff --git a/Mage.Sets/src/mage/cards/v/VeiledCrocodile.java b/Mage.Sets/src/mage/cards/v/VeiledCrocodile.java index 860795598af..3c9bb1d6743 100644 --- a/Mage.Sets/src/mage/cards/v/VeiledCrocodile.java +++ b/Mage.Sets/src/mage/cards/v/VeiledCrocodile.java @@ -105,7 +105,7 @@ class VeiledCrocodileStateTriggeredAbility extends StateTriggeredAbility { @Override public String getRule() { - return new StringBuilder("When a player has no cards in hand, if {this} is an enchantment, ").append(super.getRule()).toString(); + return "When a player has no cards in hand, if {this} is an enchantment, " + super.getRule(); } } diff --git a/Mage.Sets/src/mage/cards/v/VeteranBrawlers.java b/Mage.Sets/src/mage/cards/v/VeteranBrawlers.java index 5d58d133fd9..0eb7d3d8d62 100644 --- a/Mage.Sets/src/mage/cards/v/VeteranBrawlers.java +++ b/Mage.Sets/src/mage/cards/v/VeteranBrawlers.java @@ -64,7 +64,7 @@ class VeteranBrawlersCantBlockEffect extends RestrictionEffect { public VeteranBrawlersCantBlockEffect(FilterPermanent filter) { super(Duration.WhileOnBattlefield); this.filter = filter; - staticText = new StringBuilder("{this} can't attack if you control ").append(filter.getMessage()).toString(); + staticText = "{this} can't attack if you control " + filter.getMessage(); } public VeteranBrawlersCantBlockEffect(final VeteranBrawlersCantBlockEffect effect) { diff --git a/Mage.Sets/src/mage/cards/v/VizkopaConfessor.java b/Mage.Sets/src/mage/cards/v/VizkopaConfessor.java index acf0af63099..f9d392e22c1 100644 --- a/Mage.Sets/src/mage/cards/v/VizkopaConfessor.java +++ b/Mage.Sets/src/mage/cards/v/VizkopaConfessor.java @@ -82,7 +82,7 @@ class VizkopaConfessorEffect extends OneShotEffect { int payLife = controller.getAmount(0, controller.getLife(),"Pay how many life?", game); if (payLife > 0) { controller.loseLife(payLife, game, false); - game.informPlayers(new StringBuilder(sourceCard.getName()).append(": ").append(controller.getLogName()).append(" pays ").append(payLife).append(" life").toString()); + game.informPlayers(sourceCard.getName() + ": " + controller.getLogName() + " pays " + payLife + " life"); Cards cardsInHand = new CardsImpl(); cardsInHand.addAll(targetPlayer.getHand()); diff --git a/Mage.Sets/src/mage/cards/w/WellOfLostDreams.java b/Mage.Sets/src/mage/cards/w/WellOfLostDreams.java index 897677bdf6d..523c6df0cda 100644 --- a/Mage.Sets/src/mage/cards/w/WellOfLostDreams.java +++ b/Mage.Sets/src/mage/cards/w/WellOfLostDreams.java @@ -61,7 +61,7 @@ class WellOfLostDreamsEffect extends OneShotEffect { int xValue = controller.announceXMana(0, amount, "Announce X Value", game, source); if (xValue > 0) { if (new GenericManaCost(xValue).pay(source, game, source.getSourceId(), controller.getId(), false)) { - game.informPlayers(new StringBuilder(controller.getLogName()).append(" payed {").append(xValue).append('}').toString()); + game.informPlayers(controller.getLogName() + " payed {" + xValue + '}'); controller.drawCards(xValue, game); } else { return false; diff --git a/Mage.Sets/src/mage/cards/w/WhimsOfTheFates.java b/Mage.Sets/src/mage/cards/w/WhimsOfTheFates.java index b9334276a79..3f1006ece9d 100644 --- a/Mage.Sets/src/mage/cards/w/WhimsOfTheFates.java +++ b/Mage.Sets/src/mage/cards/w/WhimsOfTheFates.java @@ -95,7 +95,7 @@ class WhimsOfTheFateEffect extends OneShotEffect { playerPermanents.put(currentPlayer.getId(), playerPiles); for (int i = 1; i < 3; i++) { FilterPermanent filter = new FilterPermanent( - new StringBuilder("the permanents for the ").append(i == 1 ? "first " : "second ").append("pile").toString()); + "the permanents for the " + (i == 1 ? "first " : "second ") + "pile"); filter.add(new ControllerIdPredicate(currentPlayer.getId())); Target target; if (i == 1) { @@ -141,7 +141,7 @@ class WhimsOfTheFateEffect extends OneShotEffect { if (player != null) { // decide which pile to sacrifice int sacrificePile = RandomUtil.nextInt(3) + 1; // random number from 1 - 3 - game.informPlayers(new StringBuilder(player.getLogName()).append(" sacrifices pile number ").append(sacrificePile).toString()); + game.informPlayers(player.getLogName() + " sacrifices pile number " + sacrificePile); for (UUID permanentId : playerPiles.getValue().get(sacrificePile)) { Permanent permanent = game.getPermanent(permanentId); if (permanent != null) { diff --git a/Mage.Sets/src/mage/cards/w/WidespreadPanic.java b/Mage.Sets/src/mage/cards/w/WidespreadPanic.java index 22778340acc..5191dd05c3c 100644 --- a/Mage.Sets/src/mage/cards/w/WidespreadPanic.java +++ b/Mage.Sets/src/mage/cards/w/WidespreadPanic.java @@ -75,7 +75,7 @@ class WidespreadPanicTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return new StringBuilder("Whenever a spell or ability causes its controller to shuffle their library, ").append(super.getRule()).toString(); + return "Whenever a spell or ability causes its controller to shuffle their library, " + super.getRule(); } } diff --git a/Mage.Sets/src/mage/cards/w/WorldQueller.java b/Mage.Sets/src/mage/cards/w/WorldQueller.java index 0e2853b21f1..a5c435a3a85 100644 --- a/Mage.Sets/src/mage/cards/w/WorldQueller.java +++ b/Mage.Sets/src/mage/cards/w/WorldQueller.java @@ -111,7 +111,7 @@ class WorldQuellerEffect extends OneShotEffect { type = CardType.TRIBAL; } if (type != null) { - FilterControlledPermanent filter = new FilterControlledPermanent(new StringBuilder("permanent you control of type ").append(type.toString()).toString()); + FilterControlledPermanent filter = new FilterControlledPermanent("permanent you control of type " + type.toString()); filter.add(new CardTypePredicate(type)); TargetPermanent target = new TargetControlledPermanent(1, 1, filter, false); diff --git a/Mage.Sets/src/mage/cards/x/XantidSwarm.java b/Mage.Sets/src/mage/cards/x/XantidSwarm.java index 190fe2d739e..20a9c4b3484 100644 --- a/Mage.Sets/src/mage/cards/x/XantidSwarm.java +++ b/Mage.Sets/src/mage/cards/x/XantidSwarm.java @@ -83,7 +83,7 @@ class XantidSwarmTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return new StringBuilder("Whenever {this} attacks, ").append(super.getRule()).toString(); + return "Whenever {this} attacks, " + super.getRule(); } } diff --git a/Mage.Sets/src/mage/cards/z/ZhurTaaDruid.java b/Mage.Sets/src/mage/cards/z/ZhurTaaDruid.java index 395fc979f7f..eca81b5aae6 100644 --- a/Mage.Sets/src/mage/cards/z/ZhurTaaDruid.java +++ b/Mage.Sets/src/mage/cards/z/ZhurTaaDruid.java @@ -68,7 +68,7 @@ class ZhurTaaDruidAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return new StringBuilder("Whenever you tap {this} for mana, ").append(super.getRule()).toString() ; + return "Whenever you tap {this} for mana, " + super.getRule(); } @Override