From f30a1d595032c908485d480025c30bda9dc3ad23 Mon Sep 17 00:00:00 2001
From: austinio7116 <austinio@hotmail.com>
Date: Sat, 27 May 2017 06:41:54 +0000
Subject: [PATCH] Refactoring of CreatureType select sorting

---
 .../src/main/java/forge/ai/ComputerUtilCard.java     | 12 +++++-------
 .../java/forge/player/PlayerControllerHuman.java     | 12 +++++-------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
index 9ce176f29bf..4c5b9230e95 100644
--- a/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
+++ b/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
@@ -651,13 +651,11 @@ public class ComputerUtilCard {
                     }
                 }
             }
-            for(String k: c.getCurrentState().getIntrinsicKeywords()){
-                if(k.split(":")[0].equals(Keyword.FABRICATE.toString())){
-                    if (!map.containsKey("Servo")) {
-                        map.put("Servo", 1);
-                    } else {
-                        map.put("Servo", map.get("Servo") + 1);
-                    }
+            if(c.hasStartOfKeyword(Keyword.FABRICATE.toString())){
+                if (!map.containsKey("Servo")) {
+                    map.put("Servo", 1);
+                } else {
+                    map.put("Servo", map.get("Servo") + 1);
                 }
             }
         } // for
diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
index 870a839b275..7c870f5fdb8 100644
--- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
+++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
@@ -867,13 +867,11 @@ public class PlayerControllerHuman
                     }
                 }
             }
-            for(String k: c.getCurrentState().getIntrinsicKeywords()){
-                if(k.split(":")[0].equals(Keyword.FABRICATE.toString())){
-                    if (!typesInDeck.containsKey("Servo")) {
-                        typesInDeck.put("Servo", 1);
-                    } else {
-                        typesInDeck.put("Servo", typesInDeck.get("Servo") + 1);
-                    }
+            if(c.hasStartOfKeyword(Keyword.FABRICATE.toString())){
+                if (!typesInDeck.containsKey("Servo")) {
+                    typesInDeck.put("Servo", 1);
+                } else {
+                    typesInDeck.put("Servo", typesInDeck.get("Servo") + 1);
                 }
             }
         }