From 09690cf8e4bdaa392abbccde2e072feecefab21f Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Fri, 16 Dec 2011 17:14:19 +0000
Subject: [PATCH] - Made a more AI friendly fix for Briar Shield (removed
 FormerlyEnchanted).

---
 .../java/forge/card/abilityfactory/AbilityFactory.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactory.java b/src/main/java/forge/card/abilityfactory/AbilityFactory.java
index 36650836d64..54914d28843 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactory.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactory.java
@@ -1610,10 +1610,12 @@ public class AbilityFactory {
 
         else if (defined.equals("Enchanted")) {
             c = hostCard.getEnchantingCard();
-        }
-
-        else if (defined.equals("FormerlyEnchanted")) {
-            c = AbilityFactory.findRootAbility(sa).getPaidList("Sacrificed").get(0).getEnchantingCard();
+            if (c == null
+                && AbilityFactory.findRootAbility(sa) != null
+                && AbilityFactory.findRootAbility(sa).getPaidList("Sacrificed") != null
+                && !AbilityFactory.findRootAbility(sa).getPaidList("Sacrificed").isEmpty()) {
+                c = AbilityFactory.findRootAbility(sa).getPaidList("Sacrificed").get(0).getEnchantingCard();
+            }
         }
 
         else if (defined.equals("TopOfLibrary")) {