Discord feature additions, Discord startup flow changed, /f debug added

Signed-off-by: DroppingAnvil <dr0pping.4nvi1@gmail.com>
This commit is contained in:
DroppingAnvil
2019-12-12 04:48:00 -06:00
parent ca9502a4b6
commit fa10bf7003
26 changed files with 655 additions and 48 deletions

View File

@@ -4,10 +4,9 @@ import com.massivecraft.factions.Conf;
import com.massivecraft.factions.cmd.CommandContext;
import com.massivecraft.factions.cmd.CommandRequirements;
import com.massivecraft.factions.cmd.FCommand;
import com.massivecraft.factions.discord.FactionChatHandler;
import com.massivecraft.factions.discord.Discord;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL;
import net.dv8tion.jda.core.entities.Channel;
import net.dv8tion.jda.core.entities.TextChannel;
public class CmdWeeWoo extends FCommand {
@@ -42,7 +41,7 @@ public class CmdWeeWoo extends FCommand {
if (!Conf.useDiscordSystem) return;
String discordChannelId = context.faction.getWeeWooChannelId();
if (discordChannelId != null && !discordChannelId.isEmpty()) {
TextChannel textChannel = FactionChatHandler.jda.getTextChannelById(discordChannelId);
TextChannel textChannel = Discord.jda.getTextChannelById(discordChannelId);
if (textChannel == null) {
return;
}
@@ -62,7 +61,7 @@ public class CmdWeeWoo extends FCommand {
if(!Conf.useDiscordSystem) return;
String discordChannelId = context.faction.getWeeWooChannelId();
if (discordChannelId != null && !discordChannelId.isEmpty()) {
TextChannel textChannel = FactionChatHandler.jda.getTextChannelById(discordChannelId);
TextChannel textChannel = Discord.jda.getTextChannelById(discordChannelId);
if (textChannel == null) {
return;
}