From c0cf22bbf784ce726a82f59f520ee0bcd79daae3 Mon Sep 17 00:00:00 2001 From: vraskulin Date: Thu, 29 Dec 2016 16:16:08 +0300 Subject: [PATCH] Refactoring See github line by line comments in 'File changed' --- Mage/src/main/java/mage/game/Game.java | 4 ++-- Mage/src/main/java/mage/game/GameImpl.java | 17 ++++++----------- Mage/src/main/java/mage/game/Table.java | 3 +-- .../src/main/java/mage/game/ZoneChangeInfo.java | 1 - Mage/src/main/java/mage/game/ZonesHandler.java | 6 +----- Mage/src/main/java/mage/game/combat/Combat.java | 8 ++++---- .../main/java/mage/game/combat/CombatGroup.java | 2 +- .../main/java/mage/game/draft/DraftCube.java | 2 +- .../main/java/mage/game/events/GameEvent.java | 2 +- Mage/src/main/java/mage/game/match/Match.java | 2 +- .../main/java/mage/game/match/MatchImpl.java | 3 +-- .../java/mage/game/permanent/Permanent.java | 2 +- .../java/mage/game/permanent/PermanentImpl.java | 2 +- .../mage/game/permanent/token/CentaurToken.java | 1 - .../mage/game/permanent/token/DevilToken.java | 4 +++- .../mage/game/permanent/token/DroidToken.java | 4 +++- .../permanent/token/EldraziHorrorToken.java | 3 ++- .../game/permanent/token/EldraziScionToken.java | 2 +- .../game/permanent/token/EldraziSpawnToken.java | 2 +- .../mage/game/permanent/token/EwokToken.java | 4 +++- .../mage/game/permanent/token/PrismToken.java | 3 ++- .../mage/game/permanent/token/ServoToken.java | 3 ++- .../game/permanent/token/SquirrelToken.java | 3 ++- .../mage/game/permanent/token/ThrullToken.java | 3 ++- .../mage/game/permanent/token/TrooperToken.java | 4 +++- .../mage/game/permanent/token/WarriorToken.java | 2 +- .../mage/game/permanent/token/ZombieToken.java | 2 +- .../mage/game/tournament/TournamentImpl.java | 1 - .../tournament/TournamentSingleElimination.java | 1 - Mage/src/main/java/mage/game/turn/Step.java | 2 +- Mage/src/main/java/mage/game/turn/TurnMods.java | 6 +++--- 31 files changed, 51 insertions(+), 53 deletions(-) diff --git a/Mage/src/main/java/mage/game/Game.java b/Mage/src/main/java/mage/game/Game.java index 8670aab12b1..e813e7becdd 100644 --- a/Mage/src/main/java/mage/game/Game.java +++ b/Mage/src/main/java/mage/game/Game.java @@ -132,7 +132,7 @@ public interface Game extends MageItem, Serializable { void setZone(UUID objectId, Zone zone); - void addPlayer(Player player, Deck deck) throws GameException; + void addPlayer(Player player, Deck deck); Player getPlayer(UUID playerId); @@ -437,7 +437,7 @@ public interface Game extends MageItem, Serializable { // controlling the behaviour of replacement effects while permanents entering the battlefield void setScopeRelevant(boolean scopeRelevant); - public boolean getScopeRelevant(); + boolean getScopeRelevant(); // players' timers void initTimer(UUID playerId); diff --git a/Mage/src/main/java/mage/game/GameImpl.java b/Mage/src/main/java/mage/game/GameImpl.java index 56ce273b395..df59f516606 100644 --- a/Mage/src/main/java/mage/game/GameImpl.java +++ b/Mage/src/main/java/mage/game/GameImpl.java @@ -335,7 +335,7 @@ public abstract class GameImpl implements Game, Serializable { } @Override - public void addPlayer(Player player, Deck deck) throws GameException { + public void addPlayer(Player player, Deck deck) { player.useDeck(deck, this); state.addPlayer(player); } @@ -1937,7 +1937,7 @@ public abstract class GameImpl implements Game, Serializable { Player controller = this.getPlayer(planeswalker.getControllerId()); if (controller != null) { Target targetPlaneswalkerToKeep = new TargetPermanent(filterPlaneswalker); - targetPlaneswalkerToKeep.setTargetName(new StringBuilder(planeswalker.getName()).append(" to keep?").toString()); + targetPlaneswalkerToKeep.setTargetName(planeswalker.getName() + " to keep?"); controller.chooseTarget(Outcome.Benefit, targetPlaneswalkerToKeep, null, this); for (Permanent dupPlaneswalker : this.getBattlefield().getActivePermanents(filterPlaneswalker, planeswalker.getControllerId(), this)) { if (!targetPlaneswalkerToKeep.getTargets().contains(dupPlaneswalker.getId())) { @@ -2345,12 +2345,7 @@ public abstract class GameImpl implements Game, Serializable { } // Then, if that player controlled any objects on the stack not represented by cards, those objects cease to exist. this.getState().getContinuousEffects().removeInactiveEffects(this); - for (Iterator it = getStack().iterator(); it.hasNext();) { - StackObject object = it.next(); - if (object.getControllerId().equals(playerId)) { - it.remove(); - } - } + getStack().removeIf(object -> object.getControllerId().equals(playerId)); // Then, if there are any objects still controlled by that player, those objects are exiled. applyEffects(); // to remove control from effects removed meanwhile List permanents = this.getBattlefield().getAllActivePermanents(playerId); @@ -2594,10 +2589,10 @@ public abstract class GameImpl implements Game, Serializable { if (object instanceof Permanent) { Map lkiExtendedMap = lkiExtended.get(objectId); if (lkiExtendedMap != null) { - lkiExtendedMap.put(((Permanent) object).getZoneChangeCounter(this), copy); + lkiExtendedMap.put(object.getZoneChangeCounter(this), copy); } else { lkiExtendedMap = new HashMap<>(); - lkiExtendedMap.put(((Permanent) object).getZoneChangeCounter(this), copy); + lkiExtendedMap.put(object.getZoneChangeCounter(this), copy); lkiExtended.put(objectId, lkiExtendedMap); } } @@ -2689,7 +2684,7 @@ public abstract class GameImpl implements Game, Serializable { permanent.entersBattlefield(permanent.getId(), this, Zone.OUTSIDE, false); getBattlefield().addPermanent(permanent); getPermanentsEntering().remove(permanent.getId()); - ((PermanentImpl) permanent).removeSummoningSickness(); + permanent.removeSummoningSickness(); if (card.isTapped()) { permanent.setTapped(true); } diff --git a/Mage/src/main/java/mage/game/Table.java b/Mage/src/main/java/mage/game/Table.java index 1d2f2d0604d..e9d31528417 100644 --- a/Mage/src/main/java/mage/game/Table.java +++ b/Mage/src/main/java/mage/game/Table.java @@ -64,9 +64,8 @@ public class Table implements Serializable { private TableRecorder recorder; public interface TableRecorder { - void record(Table table); - }; + } protected TableEventSource tableEventSource = new TableEventSource(); diff --git a/Mage/src/main/java/mage/game/ZoneChangeInfo.java b/Mage/src/main/java/mage/game/ZoneChangeInfo.java index 7c8936d0b1d..bfbee3a7222 100644 --- a/Mage/src/main/java/mage/game/ZoneChangeInfo.java +++ b/Mage/src/main/java/mage/game/ZoneChangeInfo.java @@ -1,7 +1,6 @@ package mage.game; import mage.cards.MeldCard; -import mage.constants.Zone; import mage.game.events.ZoneChangeEvent; import mage.game.stack.Spell; diff --git a/Mage/src/main/java/mage/game/ZonesHandler.java b/Mage/src/main/java/mage/game/ZonesHandler.java index ede698ad585..427095c91bf 100644 --- a/Mage/src/main/java/mage/game/ZonesHandler.java +++ b/Mage/src/main/java/mage/game/ZonesHandler.java @@ -52,11 +52,7 @@ public class ZonesHandler { } } } - for (Iterator itr = zoneChangeInfos.iterator(); itr.hasNext();) { - if (!maybeRemoveFromSourceZone(itr.next(), game)) { - itr.remove(); - } - } + zoneChangeInfos.removeIf(zoneChangeInfo -> !maybeRemoveFromSourceZone(zoneChangeInfo, game)); for (ZoneChangeInfo zoneChangeInfo : zoneChangeInfos) { placeInDestinationZone(zoneChangeInfo, game); if (game.getPhase() != null) { // moving cards to zones before game started does not need events diff --git a/Mage/src/main/java/mage/game/combat/Combat.java b/Mage/src/main/java/mage/game/combat/Combat.java index 58c89c0b5b1..8156532bed0 100644 --- a/Mage/src/main/java/mage/game/combat/Combat.java +++ b/Mage/src/main/java/mage/game/combat/Combat.java @@ -983,7 +983,7 @@ public class Combat implements Serializable, Copyable { for (Ability ability : entry.getValue()) { if (!effect.canBlockCheckAfter(ability, game)) { if (controller.isHuman()) { - game.informPlayer(controller, new StringBuilder(blockingCreature.getLogName()).append(" can't block this way.").toString()); + game.informPlayer(controller, blockingCreature.getLogName() + " can't block this way."); return false; } else { // remove blocking creatures for AI @@ -1003,7 +1003,7 @@ public class Combat implements Serializable, Copyable { for (Ability ability : entry.getValue()) { if (!effect.canBeBlockedCheckAfter(attackingCreature, ability, game)) { if (controller.isHuman()) { - game.informPlayer(controller, new StringBuilder(attackingCreature.getLogName()).append(" can't be blocked this way.").toString()); + game.informPlayer(controller, attackingCreature.getLogName() + " can't be blocked this way."); return false; } else { // remove blocking creatures for AI @@ -1030,7 +1030,7 @@ public class Combat implements Serializable, Copyable { switch (game.getAttackOption()) { case LEFT: players = game.getState().getPlayerList(attackingPlayerId); - while (true && attackingPlayer.isInGame()) { + while (attackingPlayer.isInGame()) { Player opponent = players.getNext(game); if (attackingPlayer.hasOpponent(opponent.getId(), game)) { addDefender(opponent.getId(), game); @@ -1040,7 +1040,7 @@ public class Combat implements Serializable, Copyable { break; case RIGHT: players = game.getState().getPlayerList(attackingPlayerId); - while (true && attackingPlayer.isInGame()) { + while (attackingPlayer.isInGame()) { Player opponent = players.getPrevious(game); if (attackingPlayer.hasOpponent(opponent.getId(), game)) { addDefender(opponent.getId(), game); diff --git a/Mage/src/main/java/mage/game/combat/CombatGroup.java b/Mage/src/main/java/mage/game/combat/CombatGroup.java index c5b64a44e67..713929dcfe3 100644 --- a/Mage/src/main/java/mage/game/combat/CombatGroup.java +++ b/Mage/src/main/java/mage/game/combat/CombatGroup.java @@ -457,7 +457,7 @@ public class CombatGroup implements Serializable, Copyable { Player player = game.getPlayer(playerId); List blockerList = new ArrayList<>(blockers); blockerOrder.clear(); - while (true && player.canRespond()) { + while (player.canRespond()) { if (blockerList.size() == 1) { blockerOrder.add(blockerList.get(0)); break; diff --git a/Mage/src/main/java/mage/game/draft/DraftCube.java b/Mage/src/main/java/mage/game/draft/DraftCube.java index 2e8fddc1096..dc72fb3cf0c 100644 --- a/Mage/src/main/java/mage/game/draft/DraftCube.java +++ b/Mage/src/main/java/mage/game/draft/DraftCube.java @@ -29,7 +29,7 @@ package mage.game.draft; import java.util.ArrayList; import java.util.List; -import java.util.Random; + import mage.cards.Card; import mage.cards.repository.CardCriteria; import mage.cards.repository.CardInfo; diff --git a/Mage/src/main/java/mage/game/events/GameEvent.java b/Mage/src/main/java/mage/game/events/GameEvent.java index ee8e2306e44..a38958c2ea2 100644 --- a/Mage/src/main/java/mage/game/events/GameEvent.java +++ b/Mage/src/main/java/mage/game/events/GameEvent.java @@ -302,7 +302,7 @@ public class GameEvent implements Serializable { COMBAT_DAMAGE_APPLIED, SELECTED_ATTACKER, SELECTED_BLOCKER, //custom events - CUSTOM_EVENT; + CUSTOM_EVENT } private GameEvent(EventType type, UUID customEventType, diff --git a/Mage/src/main/java/mage/game/match/Match.java b/Mage/src/main/java/mage/game/match/Match.java index 6fc81ef884f..3f0b432902e 100644 --- a/Mage/src/main/java/mage/game/match/Match.java +++ b/Mage/src/main/java/mage/game/match/Match.java @@ -62,7 +62,7 @@ public interface Match { void submitDeck(UUID playerId, Deck deck); void updateDeck(UUID playerId, Deck deck); - void startMatch() throws GameException; + void startMatch(); void startGame() throws GameException; void sideboard(); void endGame(); diff --git a/Mage/src/main/java/mage/game/match/MatchImpl.java b/Mage/src/main/java/mage/game/match/MatchImpl.java index d3d4f1091a2..28118e75483 100644 --- a/Mage/src/main/java/mage/game/match/MatchImpl.java +++ b/Mage/src/main/java/mage/game/match/MatchImpl.java @@ -31,7 +31,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Date; import java.util.List; -import java.util.Random; import java.util.UUID; import mage.cards.decks.Deck; import mage.game.Game; @@ -121,7 +120,7 @@ public abstract class MatchImpl implements Match { } @Override - public void startMatch() throws GameException { + public void startMatch() { this.startTime = new Date(); } diff --git a/Mage/src/main/java/mage/game/permanent/Permanent.java b/Mage/src/main/java/mage/game/permanent/Permanent.java index e97a6591077..37f2a7efa2e 100644 --- a/Mage/src/main/java/mage/game/permanent/Permanent.java +++ b/Mage/src/main/java/mage/game/permanent/Permanent.java @@ -174,7 +174,7 @@ public interface Permanent extends Card, Controllable { boolean canLoyaltyBeUsed(Game game); - public void resetControl(); + void resetControl(); boolean changeControllerId(UUID controllerId, Game game); diff --git a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java index 6f292279d14..23f00de9823 100644 --- a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java +++ b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java @@ -981,7 +981,7 @@ public abstract class PermanentImpl extends CardImpl implements Permanent { moveToZone(Zone.GRAVEYARD, sourceId, game, false); Player player = game.getPlayer(getControllerId()); if (player != null && !game.isSimulation()) { - game.informPlayers(new StringBuilder(player.getLogName()).append(" sacrificed ").append(this.getLogName()).toString()); + game.informPlayers(player.getLogName() + " sacrificed " + this.getLogName()); } game.fireEvent(GameEvent.getEvent(EventType.SACRIFICED_PERMANENT, objectId, sourceId, controllerId)); return true; diff --git a/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java b/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java index 222201ef11b..d36a2886ac7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java @@ -28,7 +28,6 @@ package mage.game.permanent.token; -import java.util.Random; import mage.constants.CardType; import mage.MageInt; import mage.util.RandomUtil; diff --git a/Mage/src/main/java/mage/game/permanent/token/DevilToken.java b/Mage/src/main/java/mage/game/permanent/token/DevilToken.java index 5072881c9bc..8b3e2cafccb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DevilToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DevilToken.java @@ -28,6 +28,8 @@ package mage.game.permanent.token; import java.util.Arrays; +import java.util.Collections; + import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -44,7 +46,7 @@ public class DevilToken extends Token { public DevilToken() { super("Devil", "1/1 red Devil creature with \"When this creature dies, it deals 1 damage to target creature or player.\""); - availableImageSetCodes.addAll(Arrays.asList("SOI")); + availableImageSetCodes.addAll(Collections.singletonList("SOI")); cardType.add(CardType.CREATURE); subtype.add("Devil"); color.setRed(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/DroidToken.java b/Mage/src/main/java/mage/game/permanent/token/DroidToken.java index 5cac7577df3..d9a440efad6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DroidToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DroidToken.java @@ -28,6 +28,8 @@ package mage.game.permanent.token; import java.util.Arrays; +import java.util.Collections; + import mage.MageInt; import mage.constants.CardType; @@ -39,7 +41,7 @@ public class DroidToken extends Token { public DroidToken() { super("Droid", "1/1 colorless Droid creature token"); - availableImageSetCodes.addAll(Arrays.asList("SWS")); + availableImageSetCodes.addAll(Collections.singletonList("SWS")); cardType.add(CardType.CREATURE); cardType.add(CardType.ARTIFACT); diff --git a/Mage/src/main/java/mage/game/permanent/token/EldraziHorrorToken.java b/Mage/src/main/java/mage/game/permanent/token/EldraziHorrorToken.java index 4ee787aac2b..1ec3623b87f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EldraziHorrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EldraziHorrorToken.java @@ -29,6 +29,7 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import mage.MageInt; import mage.constants.CardType; @@ -42,7 +43,7 @@ public class EldraziHorrorToken extends Token { final static private List tokenImageSets = new ArrayList<>(); static { - tokenImageSets.addAll(Arrays.asList("EMN")); + tokenImageSets.addAll(Collections.singletonList("EMN")); } public EldraziHorrorToken() { diff --git a/Mage/src/main/java/mage/game/permanent/token/EldraziScionToken.java b/Mage/src/main/java/mage/game/permanent/token/EldraziScionToken.java index c2564d3669c..550e915f116 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EldraziScionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EldraziScionToken.java @@ -30,7 +30,7 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Random; + import mage.MageInt; import mage.Mana; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java b/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java index 43956bef299..e7fab3ffbe3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java @@ -30,7 +30,7 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Random; + import mage.MageInt; import mage.Mana; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage/src/main/java/mage/game/permanent/token/EwokToken.java b/Mage/src/main/java/mage/game/permanent/token/EwokToken.java index fbdaf99040c..1d930992c5d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EwokToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EwokToken.java @@ -28,6 +28,8 @@ package mage.game.permanent.token; import java.util.Arrays; +import java.util.Collections; + import mage.constants.CardType; /** @@ -38,7 +40,7 @@ public class EwokToken extends Token { public EwokToken() { super("Ewok", "1/1 green Ewok creature tokens", 1, 1); - availableImageSetCodes.addAll(Arrays.asList("SWS")); + availableImageSetCodes.addAll(Collections.singletonList("SWS")); cardType.add(CardType.CREATURE); subtype.add("Ewok"); diff --git a/Mage/src/main/java/mage/game/permanent/token/PrismToken.java b/Mage/src/main/java/mage/game/permanent/token/PrismToken.java index b9dd23474a2..b59ddd270f0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PrismToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PrismToken.java @@ -29,6 +29,7 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import mage.MageInt; import mage.constants.CardType; @@ -42,7 +43,7 @@ public class PrismToken extends Token { final static private List tokenImageSets = new ArrayList<>(); static { - tokenImageSets.addAll(Arrays.asList("VIS")); + tokenImageSets.addAll(Collections.singletonList("VIS")); } public PrismToken() { diff --git a/Mage/src/main/java/mage/game/permanent/token/ServoToken.java b/Mage/src/main/java/mage/game/permanent/token/ServoToken.java index 961642ce4b5..0c9db5b39f0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ServoToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ServoToken.java @@ -29,6 +29,7 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import mage.MageInt; import mage.constants.CardType; @@ -43,7 +44,7 @@ public class ServoToken extends Token { final static private List tokenImageSets = new ArrayList<>(); static { - tokenImageSets.addAll(Arrays.asList("KLD")); + tokenImageSets.addAll(Collections.singletonList("KLD")); } public ServoToken() { diff --git a/Mage/src/main/java/mage/game/permanent/token/SquirrelToken.java b/Mage/src/main/java/mage/game/permanent/token/SquirrelToken.java index c8b5e56fdb6..77dc0fdabad 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SquirrelToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SquirrelToken.java @@ -29,6 +29,7 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import mage.MageInt; import mage.constants.CardType; @@ -42,7 +43,7 @@ public class SquirrelToken extends Token { final static private List tokenImageSets = new ArrayList<>(); static { - tokenImageSets.addAll(Arrays.asList("CNS")); + tokenImageSets.addAll(Collections.singletonList("CNS")); } public SquirrelToken() { diff --git a/Mage/src/main/java/mage/game/permanent/token/ThrullToken.java b/Mage/src/main/java/mage/game/permanent/token/ThrullToken.java index 3ce76ac9e26..759a93d2010 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ThrullToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ThrullToken.java @@ -30,6 +30,7 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import mage.MageInt; import mage.constants.CardType; @@ -43,7 +44,7 @@ public class ThrullToken extends Token { final static private List tokenImageSets = new ArrayList<>(); static { - tokenImageSets.addAll(Arrays.asList("MM2")); + tokenImageSets.addAll(Collections.singletonList("MM2")); } public ThrullToken() { diff --git a/Mage/src/main/java/mage/game/permanent/token/TrooperToken.java b/Mage/src/main/java/mage/game/permanent/token/TrooperToken.java index 6f72120ed0c..00a5b43e450 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TrooperToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TrooperToken.java @@ -28,6 +28,8 @@ package mage.game.permanent.token; import java.util.Arrays; +import java.util.Collections; + import mage.MageInt; import mage.constants.CardType; @@ -39,7 +41,7 @@ public class TrooperToken extends Token { public TrooperToken() { super("Trooper", "1/1 white Trooper creature token"); - availableImageSetCodes.addAll(Arrays.asList("SWS")); + availableImageSetCodes.addAll(Collections.singletonList("SWS")); cardType.add(CardType.CREATURE); subtype.add("Trooper"); diff --git a/Mage/src/main/java/mage/game/permanent/token/WarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/WarriorToken.java index 6a34f22d336..f976c9fba01 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WarriorToken.java @@ -29,7 +29,7 @@ package mage.game.permanent.token; import java.util.Arrays; -import java.util.Random; + import mage.MageInt; import mage.constants.CardType; import mage.util.RandomUtil; diff --git a/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java index 8da3f8ad3d5..0cd8b1b150e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java @@ -30,7 +30,7 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Random; + import mage.MageInt; import mage.constants.CardType; import mage.util.RandomUtil; diff --git a/Mage/src/main/java/mage/game/tournament/TournamentImpl.java b/Mage/src/main/java/mage/game/tournament/TournamentImpl.java index b01048d3b65..eecd4856547 100644 --- a/Mage/src/main/java/mage/game/tournament/TournamentImpl.java +++ b/Mage/src/main/java/mage/game/tournament/TournamentImpl.java @@ -35,7 +35,6 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Random; import java.util.UUID; import java.util.concurrent.CopyOnWriteArrayList; import mage.cards.ExpansionSet; diff --git a/Mage/src/main/java/mage/game/tournament/TournamentSingleElimination.java b/Mage/src/main/java/mage/game/tournament/TournamentSingleElimination.java index 742e288ea3d..e57de8b70c8 100644 --- a/Mage/src/main/java/mage/game/tournament/TournamentSingleElimination.java +++ b/Mage/src/main/java/mage/game/tournament/TournamentSingleElimination.java @@ -28,7 +28,6 @@ package mage.game.tournament; -import java.util.List; import java.util.Map; import java.util.UUID; import mage.constants.MultiplayerAttackOption; diff --git a/Mage/src/main/java/mage/game/turn/Step.java b/Mage/src/main/java/mage/game/turn/Step.java index 0f646ccc69d..bf4d50d48ba 100644 --- a/Mage/src/main/java/mage/game/turn/Step.java +++ b/Mage/src/main/java/mage/game/turn/Step.java @@ -49,7 +49,7 @@ public abstract class Step implements Serializable { protected StepPart stepPart; public enum StepPart { - PRE, PRIORITY, POST; + PRE, PRIORITY, POST } public abstract Step copy(); diff --git a/Mage/src/main/java/mage/game/turn/TurnMods.java b/Mage/src/main/java/mage/game/turn/TurnMods.java index 947791def94..2fc1a3c1c16 100644 --- a/Mage/src/main/java/mage/game/turn/TurnMods.java +++ b/Mage/src/main/java/mage/game/turn/TurnMods.java @@ -52,7 +52,7 @@ public class TurnMods extends ArrayList { ListIterator it = this.listIterator(this.size()); while (it.hasPrevious()) { TurnMod turnMod = it.previous(); - if (turnMod.isExtraTurn() == true && turnMod.getPlayerId().equals(playerId)) { + if (turnMod.isExtraTurn() && turnMod.getPlayerId().equals(playerId)) { it.remove(); return turnMod.getId(); } @@ -64,7 +64,7 @@ public class TurnMods extends ArrayList { ListIterator it = this.listIterator(this.size()); while (it.hasPrevious()) { TurnMod turnMod = it.previous(); - if (turnMod.isExtraTurn() == true) { + if (turnMod.isExtraTurn()) { it.remove(); return turnMod; } @@ -76,7 +76,7 @@ public class TurnMods extends ArrayList { ListIterator it = this.listIterator(this.size()); while (it.hasPrevious()) { TurnMod turnMod = it.previous(); - if (turnMod.isSkipTurn() == true && turnMod.getPlayerId().equals(playerId)) { + if (turnMod.isSkipTurn() && turnMod.getPlayerId().equals(playerId)) { it.remove(); return true; }