Changeset 224 for binary-improvements/7dtd-server-fixes/src/CommandExtensions.cs

Timestamp:

Apr 2, 2015, 9:16:34 PM (10 years ago)

Author:

alloc

Message:

A11 preps

File:

• binary-improvements/7dtd-server-fixes/src/CommandExtensions.cs (modified) (1 diff)

binary-improvements/7dtd-server-fixes/src/CommandExtensions.cs

@@ -12 +12 @@
                         try {
                                 ConsoleSdtd cons = manager.m_GUIConsole;
-                                string ns = "AllocsFixes.CustomCommands";
-                                string basetype = "ConsoleCommand";
+                                Type commandType = typeof (ConsoleCommand);
 
-                                foreach (Type t in Assembly.GetExecutingAssembly ().GetTypes()) {
-                                        if (t.IsClass && t.Namespace.Equals (ns) && t.BaseType.Name.Equals (basetype)) {
-                                                try {
-                                                        ConstructorInfo ctor = t.GetConstructor (new Type[] {typeof(ConsoleSdtd)});
-                                                        cons.AddCommand ((ConsoleCommand)ctor.Invoke (new object[] {cons}));
-                                                } catch (Exception e) {
-                                                        Log.Out ("Could not register custom command \"" + t.Name + "\": " + e);
+                                Mods.ModData thisMd = new Mods.ModData ();
+                                thisMd.assembly = Assembly.GetExecutingAssembly ();
+
+                                List<Mods.ModData> mods = Mods.LoadedMods ();
+                                mods.Add (thisMd);
+
+                                foreach (Mods.ModData md in mods) {
+                                        foreach (Type t in md.assembly.GetTypes()) {
+                                                if (t.IsClass && commandType.IsAssignableFrom (t)) {
+                                                        try {
+                                                                ConstructorInfo ctor = t.GetConstructor (new Type[] {typeof(ConsoleSdtd)});
+                                                                cons.AddCommand ((ConsoleCommand)ctor.Invoke (new object[] {cons}));
+                                                        } catch (Exception e) {
+                                                                Log.Out ("Could not register custom command \"" + t.Name + "\": " + e);
+                                                        }
                                                 }
                                         }