From 9fcc452ed347ce4dba1d704951c2af66397075e4 Mon Sep 17 00:00:00 2001
From: Christian <cpw@weeksfamily.ca>
Date: Thu, 23 Aug 2012 14:33:54 -0400
Subject: [PATCH] Only active mods should have dependencies checked, and be
 sorted

---
 common/cpw/mods/fml/common/Loader.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/cpw/mods/fml/common/Loader.java b/common/cpw/mods/fml/common/Loader.java
index 6489fe15df..dfbd964537 100644
--- a/common/cpw/mods/fml/common/Loader.java
+++ b/common/cpw/mods/fml/common/Loader.java
@@ -178,12 +178,12 @@ public class Loader
         try
         {
             BiMap<String, ArtifactVersion> modVersions = HashBiMap.create();
-            for (ModContainer mod : mods)
+            for (ModContainer mod : getActiveModList())
             {
                 modVersions.put(mod.getModId(), mod.getProcessedVersion());
             }
 
-            for (ModContainer mod : mods)
+            for (ModContainer mod : getActiveModList())
             {
                 Set<ArtifactVersion> missingMods = Sets.difference(mod.getRequirements(), modVersions.values());
                 if (!missingMods.isEmpty())
@@ -212,7 +212,7 @@ public class Loader
 
             FMLLog.fine("All mod requirements are satisfied");
 
-            ModSorter sorter = new ModSorter(mods, namedMods);
+            ModSorter sorter = new ModSorter(getActiveModList(), namedMods);
 
             try
             {
@@ -232,7 +232,7 @@ public class Loader
         finally
         {
             FMLLog.fine("Mod sorting data:");
-            for (ModContainer mod : mods)
+            for (ModContainer mod : getActiveModList())
             {
                 if (!mod.isImmutable())
                 {
@@ -416,9 +416,9 @@ public class Loader
         modController.transition(LoaderState.LOADING);
         ModDiscoverer disc = identifyMods();
         disableRequestedMods();
+        modController.distributeStateMessage(FMLLoadEvent.class);
         sortModList();
         mods = ImmutableList.copyOf(mods);
-        modController.distributeStateMessage(FMLLoadEvent.class);
         modController.transition(LoaderState.CONSTRUCTING);
         modController.distributeStateMessage(LoaderState.CONSTRUCTING, modClassLoader, disc.getASMTable());
         modController.transition(LoaderState.PREINITIALIZATION);