From 238c88a8b6ecb92968fa3d667ea200fe0b6d68df Mon Sep 17 00:00:00 2001
From: Lymia Aluysia <lymia@lymiahugs.com>
Date: Sat, 24 Sep 2016 12:33:47 -0500
Subject: [PATCH] Added mechanic for CardImpl to search other classloaders for
 cards.

---
 Mage/src/main/java/mage/cards/CardImpl.java   |  6 +++
 .../PluginClassloaderRegistery.java           | 54 +++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 Mage/src/main/java/mage/cards/repository/PluginClassloaderRegistery.java

diff --git a/Mage/src/main/java/mage/cards/CardImpl.java b/Mage/src/main/java/mage/cards/CardImpl.java
index d4a1870121..3e1b8d18a9 100644
--- a/Mage/src/main/java/mage/cards/CardImpl.java
+++ b/Mage/src/main/java/mage/cards/CardImpl.java
@@ -39,6 +39,7 @@ import mage.abilities.Ability;
 import mage.abilities.PlayLandAbility;
 import mage.abilities.SpellAbility;
 import mage.abilities.mana.ManaAbility;
+import mage.cards.repository.PluginClassloaderRegistery;
 import mage.constants.CardType;
 import mage.constants.ColoredManaSymbol;
 import mage.constants.Rarity;
@@ -160,6 +161,11 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
         try {
             return createCard(Class.forName(name));
         } catch (ClassNotFoundException ex) {
+            try {
+                return createCard(PluginClassloaderRegistery.forName(name));
+            } catch (ClassNotFoundException ex2) {
+                // ignored
+            }
             logger.fatal("Error loading card: " + name, ex);
             return null;
         }
diff --git a/Mage/src/main/java/mage/cards/repository/PluginClassloaderRegistery.java b/Mage/src/main/java/mage/cards/repository/PluginClassloaderRegistery.java
new file mode 100644
index 0000000000..f9edd1468a
--- /dev/null
+++ b/Mage/src/main/java/mage/cards/repository/PluginClassloaderRegistery.java
@@ -0,0 +1,54 @@
+/*
+ *  Copyright 2016 Lymia <lymia@lymiahugs.com>. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+
+package mage.cards.repository;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Stores a list of classloaders for plugins that define custom sets.
+ *
+ * @author Lymia
+ */
+public class PluginClassloaderRegistery {
+    static List<ClassLoader> pluginClassloaders = new ArrayList<>();
+
+    public static void registerPluginClassloader(ClassLoader cl) {
+        pluginClassloaders.add(cl);
+    }
+
+    public static Class<?> forName(String className) throws ClassNotFoundException {
+        for(ClassLoader cl : pluginClassloaders) try {
+            return Class.forName(className, true, cl);
+        } catch (ClassNotFoundException c) {
+            // ignored
+        }
+        throw new ClassNotFoundException();
+    }
+}