Redstoner/ModuleLoader
Archived
0
Fork 0
Code Pull Requests Activity

try/catched module enabling

Browse Source
This commit is contained in:
Pepich 2017-02-02 20:49:10 +01:00
parent fb5e6fa10b
commit 907c68525b
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/redstoner/coremods/moduleLoader/ModuleLoader.java
View File

@ -21,7 +21,7 @@ import com.redstoner.modules.Module;
/** The module loader, mother of all modules. Responsible for loading and taking care of all modules. /** The module loader, mother of all modules. Responsible for loading and taking care of all modules.
* *
* @author Pepich */ * @author Pepich */
@Version(major = 1, minor = 3, revision = 1, compatible = -1) @Version(major = 1, minor = 3, revision = 2, compatible = -1)
public final class ModuleLoader implements CoreModule public final class ModuleLoader implements CoreModule
{ {
private static ModuleLoader instance; private static ModuleLoader instance;
@ -64,17 +64,25 @@ public final class ModuleLoader implements CoreModule
{ {
if (module.enabled()) if (module.enabled())
continue; continue;
if (module.enable()) try
{ {
CommandManager.registerCommand(module.getCommandString(), module, Main.plugin); if (module.enable())
if (module.getClass().isAnnotationPresent(AutoRegisterListener.class) && (module instanceof Listener))
{ {
Bukkit.getPluginManager().registerEvents((Listener) module, Main.plugin); CommandManager.registerCommand(module.getCommandString(), module, Main.plugin);
if (module.getClass().isAnnotationPresent(AutoRegisterListener.class)
&& (module instanceof Listener))
{
Bukkit.getPluginManager().registerEvents((Listener) module, Main.plugin);
}
Utils.log("Loaded module " + module.getClass().getName());
} }
Utils.log("Loaded module " + module.getClass().getName()); else
Utils.error("Failed to load module " + module.getClass().getName());
} }
else catch (Exception e)
{
Utils.error("Failed to load module " + module.getClass().getName()); Utils.error("Failed to load module " + module.getClass().getName());
}
} }
} }