Merge pull request #129 from RogueAI42/master

ReflectMan Saves The Day..............

1 files changed, 3 insertions, 19 deletions

diff --git a/ShiftOS_TheReturn/Shiftorium.cs b/ShiftOS_TheReturn/Shiftorium.cs
index 7faf336..0362566 100644
--- a/ShiftOS_TheReturn/Shiftorium.cs
+++ b/ShiftOS_TheReturn/Shiftorium.cs
@@ -214,23 +214,11 @@ namespace ShiftOS.Engine
         {
             upgDb = new List<ShiftoriumUpgrade>();
             //Now we probe for ShiftoriumUpgradeAttributes for mods.
-            foreach (var file in System.IO.Directory.GetFiles(Environment.CurrentDirectory))
-            {
-                if (file.EndsWith(".exe") || file.EndsWith(".dll"))
-                {
-                    try
-                    {
-                        var asm = Assembly.LoadFile(file);
-                        foreach (var type in asm.GetTypes())
+                        foreach (var type in ReflectMan.Types)
                         {
                             if (type.GetInterfaces().Contains(typeof(IShiftoriumProvider)))
-                            {
-                                if (type.GetCustomAttributes().FirstOrDefault(x => x is ShiftoriumProviderAttribute) != null)
-                                {
-                                    var _p = Activator.CreateInstance(type, null) as IShiftoriumProvider;
-                                    upgDb.AddRange(_p.GetDefaults());
-                                }
-                            }
+                                if (type.GetCustomAttributes().Any(x => x is ShiftoriumProviderAttribute))
+                                    upgDb.AddRange((Activator.CreateInstance(type, null) as IShiftoriumProvider).GetDefaults());
 
 
                             ShiftoriumUpgradeAttribute attrib = type.GetCustomAttributes(false).FirstOrDefault(x => x is ShiftoriumUpgradeAttribute) as ShiftoriumUpgradeAttribute;
@@ -310,10 +298,6 @@ namespace ShiftOS.Engine
                             }
 
                         }
-                    }
-                    catch { }
-                }
-            }