Browse Source

Merge branch 'master' of yannicpunktdee.de:yannic/YoshiBot

master
Paul Glaß 4 years ago
parent
commit
5d8ee42a0c
1 changed files with 10 additions and 4 deletions
  1. +10
    -4
      app/src/main/java/de/yannicpunktdee/yoshibot/main/YoshiBot.java

+ 10
- 4
app/src/main/java/de/yannicpunktdee/yoshibot/main/YoshiBot.java View File

@ -13,7 +13,6 @@ import de.yannicpunktdee.yoshibot.command.YoshiCommandDistributor;
import de.yannicpunktdee.yoshibot.listeners.CommandLine; import de.yannicpunktdee.yoshibot.listeners.CommandLine;
import de.yannicpunktdee.yoshibot.listeners.DiscordEventListener; import de.yannicpunktdee.yoshibot.listeners.DiscordEventListener;
import de.yannicpunktdee.yoshibot.utils.Logger; import de.yannicpunktdee.yoshibot.utils.Logger;
import de.yannicpunktdee.yoshibot.utils.RedditProvider;
import de.yannicpunktdee.yoshibot.utils.Resources; import de.yannicpunktdee.yoshibot.utils.Resources;
import de.yannicpunktdee.yoshibot.utils.SauceProvider; import de.yannicpunktdee.yoshibot.utils.SauceProvider;
import lombok.Getter; import lombok.Getter;
@ -21,9 +20,12 @@ import lombok.SneakyThrows;
import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.JDABuilder; import net.dv8tion.jda.api.JDABuilder;
import net.dv8tion.jda.api.OnlineStatus; import net.dv8tion.jda.api.OnlineStatus;
import net.dv8tion.jda.api.entities.*;
import net.dv8tion.jda.api.entities.Activity;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.PermissionOverride;
import net.dv8tion.jda.api.entities.VoiceChannel;
import net.dv8tion.jda.api.exceptions.InsufficientPermissionException;
import javax.security.auth.login.LoginException;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -163,7 +165,11 @@ public final class YoshiBot {
} }
if (guild.getAudioManager().getConnectedChannel() != null && if (guild.getAudioManager().getConnectedChannel() != null &&
vc.getIdLong() == guild.getAudioManager().getConnectedChannel().getIdLong()) return; vc.getIdLong() == guild.getAudioManager().getConnectedChannel().getIdLong()) return;
guild.getAudioManager().openAudioConnection(vc);
try {
guild.getAudioManager().openAudioConnection(vc);
} catch (InsufficientPermissionException e) {
Logger.logWarning("Durfte dem VoiceChannel " + vc.getName() + " nicht beitreten.");
}
} }
public void joinVoiceChannelWithMostMembers() { public void joinVoiceChannelWithMostMembers() {


Loading…
Cancel
Save