From f480d0bebb84e230539a8a3cf05b2aed7b70c8f1 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Fri, 12 Jun 2020 15:14:28 +0200
Subject: [PATCH] * Some minor code and text clean up.

---
 .../src/mage/game/OathbreakerFreeForAll.java     | 16 ++++++++--------
 Mage.Sets/src/mage/cards/t/TreeOfPerdition.java  |  2 +-
 .../main/java/mage/game/GameCommanderImpl.java   |  4 ++--
 Mage/src/main/java/mage/players/PlayerImpl.java  |  3 ++-
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Mage.Server.Plugins/Mage.Game.OathbreakerFreeForAll/src/mage/game/OathbreakerFreeForAll.java b/Mage.Server.Plugins/Mage.Game.OathbreakerFreeForAll/src/mage/game/OathbreakerFreeForAll.java
index 90f673c200e..7cbb8eb5b04 100644
--- a/Mage.Server.Plugins/Mage.Game.OathbreakerFreeForAll/src/mage/game/OathbreakerFreeForAll.java
+++ b/Mage.Server.Plugins/Mage.Game.OathbreakerFreeForAll/src/mage/game/OathbreakerFreeForAll.java
@@ -25,8 +25,8 @@ import java.util.*;
 public class OathbreakerFreeForAll extends GameCommanderImpl {
 
     private int numPlayers;
-    private Map<UUID, Set<UUID>> playerSignatureSpells = new HashMap<>();
-    private Map<UUID, Set<UUID>> playerOathbreakers = new HashMap<>();
+    private final Map<UUID, Set<UUID>> playerSignatureSpells = new HashMap<>();
+    private final Map<UUID, Set<UUID>> playerOathbreakers = new HashMap<>();
 
     private static final String COMMANDER_NAME_OATHBREAKER = "Oathbreaker";
     private static final String COMMANDER_NAME_SIGNATURE_SPELL = "Signature Spell";
@@ -122,19 +122,19 @@ public class OathbreakerFreeForAll extends GameCommanderImpl {
         if (player != null) {
             Set<UUID> commanders = this.playerOathbreakers.getOrDefault(player.getId(), new HashSet<>());
             Set<UUID> spells = this.playerSignatureSpells.getOrDefault(player.getId(), new HashSet<>());
-            for (UUID id : player.getCommandersIds()) {
+            for (UUID commanderId : getCommandersIds(player, commanderCardType)) {
                 switch (commanderCardType) {
                     case ANY:
-                        res.add(id);
+                        res.add(commanderId);
                         break;
                     case COMMANDER_OR_OATHBREAKER:
-                        if (commanders.contains(id)) {
-                            res.add(id);
+                        if (commanders.contains(commanderId)) {
+                            res.add(commanderId);
                         }
                         break;
                     case SIGNATURE_SPELL:
-                        if (spells.contains(id)) {
-                            res.add(id);
+                        if (spells.contains(commanderId)) {
+                            res.add(commanderId);
                         }
                         break;
                     default:
diff --git a/Mage.Sets/src/mage/cards/t/TreeOfPerdition.java b/Mage.Sets/src/mage/cards/t/TreeOfPerdition.java
index 78a0d448b8a..131b6a1d5d2 100644
--- a/Mage.Sets/src/mage/cards/t/TreeOfPerdition.java
+++ b/Mage.Sets/src/mage/cards/t/TreeOfPerdition.java
@@ -54,7 +54,7 @@ class TreeOfPerditionEffect extends OneShotEffect {
 
     public TreeOfPerditionEffect() {
         super(Outcome.Neutral);
-        staticText = "Exchange target opponent's life total with Tree of Perdition's toughness";
+        staticText = "Exchange target opponent's life total with {this}'s toughness";
     }
 
     public TreeOfPerditionEffect(final TreeOfPerditionEffect effect) {
diff --git a/Mage/src/main/java/mage/game/GameCommanderImpl.java b/Mage/src/main/java/mage/game/GameCommanderImpl.java
index 31709e29650..ade44a77272 100644
--- a/Mage/src/main/java/mage/game/GameCommanderImpl.java
+++ b/Mage/src/main/java/mage/game/GameCommanderImpl.java
@@ -55,8 +55,8 @@ public abstract class GameCommanderImpl extends GameImpl {
             Player player = getPlayer(playerId);
             if (player != null) {
                 // add new commanders
-                for (UUID id : player.getSideboard()) {
-                    Card card = this.getCard(id);
+                for (UUID cardId : player.getSideboard()) {
+                    Card card = this.getCard(cardId);
                     if (card != null) {
                         // Check for companions. If it is the only card in the sideboard, it is the commander, not a companion.
                         if (player.getSideboard().size() > 1 && card.getAbilities(this).stream().anyMatch(ability -> ability instanceof CompanionAbility)) {
diff --git a/Mage/src/main/java/mage/players/PlayerImpl.java b/Mage/src/main/java/mage/players/PlayerImpl.java
index db4f20f6619..c7005478da2 100644
--- a/Mage/src/main/java/mage/players/PlayerImpl.java
+++ b/Mage/src/main/java/mage/players/PlayerImpl.java
@@ -4272,7 +4272,8 @@ public abstract class PlayerImpl implements Player, Serializable {
         cards.addAll(getLibrary().getTopCards(game, value));
         if (!cards.isEmpty()) {
             TargetCard target = new TargetCard(0, cards.size(), Zone.LIBRARY,
-                    new FilterCard("cards to PUT on the BOTTOM of your library (Scry)"));
+                    new FilterCard("card" + (cards.size() == 1 ? "":"s") 
+                            + " to PUT on the BOTTOM of your library (Scry)"));
             chooseTarget(Outcome.Benefit, cards, target, source, game);
             putCardsOnBottomOfLibrary(new CardsImpl(target.getTargets()), game, source, true);
             cards.removeAll(target.getTargets());