= Merge cleanup

This commit is contained in:
Matthew Cech
2019-06-19 19:56:43 -07:00
parent aa01198d24
commit 2a2b46a507
9 changed files with 79 additions and 80 deletions
+6 -6
View File
@@ -48,13 +48,13 @@ public class Main extends ListenerAdapter
{
// Factory startup. The ordering is intentional.
GlobalLog.initialize();
databaseManager = ObjectBuilderFactory.ConstructDatabaseManager();
commandEnabler = ObjectBuilderFactory.ConstructCommandEnabler();
commandManager = ObjectBuilderFactory.ConstructCommandManager(commandEnabler);
stats = ObjectBuilderFactory.ConstructStats(commandManager);
databaseManager = ObjectBuilderFactory.constructDatabaseManager();
commandEnabler = ObjectBuilderFactory.constructCommandEnabler();
commandManager = ObjectBuilderFactory.constructCommandManager(commandEnabler);
stats = ObjectBuilderFactory.constructStats(commandManager);
charManager = new CharacterManager();
rpManager = ObjectBuilderFactory.ConstructRPManager();
pluginManager = ObjectBuilderFactory.ConstructPluginManager();
rpManager = ObjectBuilderFactory.constructRPManager();
pluginManager = ObjectBuilderFactory.constructPluginManager();
// Bot startup
kittyCore = ObjectBuilderFactory.ConstructKittyCore();