=Config file bug fixes

This commit is contained in:
Alex
2019-08-09 23:23:43 -04:00
parent 81d3bd13b0
commit 2c486d7da1
12 changed files with 43 additions and 50 deletions
+5 -6
View File
@@ -7,8 +7,8 @@ import java.util.concurrent.Semaphore;
import javax.security.auth.login.LoginException;
import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
//import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
//import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
import core.lua.PluginManager;
import dataStructures.*;
@@ -20,7 +20,7 @@ import net.dv8tion.jda.core.entities.*;
import net.dv8tion.jda.core.events.message.guild.GuildMessageReceivedEvent;
import offline.Ref;
import utils.AdminControl;
import utils.AudioUtils;
//import utils.AudioUtils;
import utils.GlobalLog;
import utils.LogFilter;
@@ -55,7 +55,7 @@ public class ObjectBuilderFactory
private static CommandManager commandManager;
//Audio track manager
private static AudioPlayerManager audioPlayer = new DefaultAudioPlayerManager();
// private static AudioPlayerManager audioPlayer = new DefaultAudioPlayerManager();
// Localization classes - these are singletons, but should be initialized before almost all other
// things so their inclusion in the factory is to ensure they're started at the correct time.
@@ -147,8 +147,7 @@ public class ObjectBuilderFactory
else
{
// Construct a new guild with defaults
guild = new KittyGuild(uid, new AdminControl(event.getGuild()), emotesString,
new AudioUtils(event.getGuild(), audioPlayer.createPlayer()));
guild = new KittyGuild(uid, new AdminControl(event.getGuild()), emotesString);
DatabaseManager.instance.globalRegister(guild);
guildCache.put(uid, guild);
}
+4 -1
View File
@@ -41,7 +41,10 @@ public class SubCommandFramework
}
catch(Exception e)
{
return new SubCommandFormattable("That's not a valid subcommand!");
String help = Stats.instance.getHelpText(input.key);
if(help != null)
return new SubCommandFormattable(help);
return new SubCommandFormattable("Something has gone very wrong.");
}
}
}