From 14e9edf6a6c377e7070b5a4ca57a3337200e739f Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Mon, 23 Jul 2012 10:45:46 +0000
Subject: [PATCH] - Fixed Coat of Arms.

---
 src/main/java/forge/GameActionUtil.java | 37 ++++++-------------------
 1 file changed, 9 insertions(+), 28 deletions(-)

diff --git a/src/main/java/forge/GameActionUtil.java b/src/main/java/forge/GameActionUtil.java
index 072e6d14583..f9cfeae7a21 100644
--- a/src/main/java/forge/GameActionUtil.java
+++ b/src/main/java/forge/GameActionUtil.java
@@ -1406,37 +1406,18 @@ public final class GameActionUtil {
             // add +1/+1 to cards
             list.clear();
             final int num = AllZoneUtil.getCardsIn(ZoneType.Battlefield, "Coat of Arms").size();
+            final CardList creatures = AllZoneUtil.getCardsIn(ZoneType.Battlefield).getType("Creature");
 
-            // for each zone found add +1/+1 to each card
-            for (int j = 0; j < num; j++) {
-                final CardList creature = AllZoneUtil.getCardsIn(ZoneType.Battlefield);
-
-                for (int i = 0; i < creature.size(); i++) {
-                    final Card crd = creature.get(i);
-                    CardList type = AllZoneUtil.getCardsIn(ZoneType.Battlefield);
-                    type = type.filter(new CardListFilter() {
-                        @Override
-                        public boolean addCard(final Card card) {
-                            return !card.equals(crd) && card.isCreature();
-                        }
-                    });
-                    final CardList alreadyAdded = new CardList();
-                    for (int x = 0; x < type.size(); x++) {
-                        alreadyAdded.clear();
-                        for (int x2 = 0; x2 < type.get(x).getType().size(); x2++) {
-                            if (!alreadyAdded.contains(type.get(x))) {
-                                if (CardUtil.isACreatureType(type.get(x).getType().get(x2))) {
-                                    if (crd.isType(type.get(x).getType().get(x2))) {
-                                        alreadyAdded.add(type.get(x));
-                                        crd.addSemiPermanentAttackBoost(1);
-                                        crd.addSemiPermanentDefenseBoost(1);
-                                        this.gloriousAnthemList.add(crd);
-                                    }
-                                }
-                            }
+            for (Card c : creatures) {
+                for (Card c2 : creatures) {
+                    if (!c.equals(c2) && c.sharesCreatureTypeWith(c2)) {
+                        for (int j = 0; j < num; j++) {
+                            c.addSemiPermanentAttackBoost(1);
+                            c.addSemiPermanentDefenseBoost(1);
+                            this.gloriousAnthemList.add(c);
                         }
                     }
-                } // for inner
+                }
             } // for outer
         } // execute
     }; // coatOfArms