From 9a206ff33850921f00a08edf0ef210d62fde8638 Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Mon, 30 Apr 2018 08:49:20 +0300
Subject: [PATCH] - Some style and logic fixes.

---
 forge-ai/src/main/java/forge/ai/ability/AttachAi.java | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/forge-ai/src/main/java/forge/ai/ability/AttachAi.java b/forge-ai/src/main/java/forge/ai/ability/AttachAi.java
index dd3443e9918..4074512d7b0 100644
--- a/forge-ai/src/main/java/forge/ai/ability/AttachAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/AttachAi.java
@@ -1314,17 +1314,14 @@ public class AttachAi extends SpellAbilityAi {
 
         // Don't play if would choose a color the target is already protected from
         if (sa.getHostCard().hasSVar("ChosenProtection")) {
-            CardCollectionView oppAllCards = CardCollection.combine
-                    (ComputerUtil.getOpponentFor(ai).getAllCards());
+            CardCollectionView oppAllCards = ai.getOpponents().getCardsIn(ZoneType.Battlefield);
             String cc = ComputerUtilCard.getMostProminentColor(oppAllCards);
             if (card.hasKeyword("Protection from " + cc.toLowerCase())) {
                 return false;
             }
             // Also don't play if it would destroy own Aura
             for (Card c : card.getEnchantedBy(false)) {
-                if ((c.getController().equals(ai))
-                        && (c.isOfColor(cc))
-                        ) {
+                if ((c.getController().equals(ai)) && (c.isOfColor(cc))) {
                     return false;
                 }
             }