Browse Source

Greetings and byebyes Abfrage, ob überhaupt enabled und Rename von CommandListener

pull/2/head
yl60lepu 4 years ago
parent
commit
faf8af055e
2 changed files with 7 additions and 3 deletions
  1. +5
    -1
      app/src/main/java/de/yannicpunktdee/yoshibot/listeners/DiscordEventListener.java
  2. +2
    -2
      app/src/main/java/de/yannicpunktdee/yoshibot/main/YoshiBot.java

app/src/main/java/de/yannicpunktdee/yoshibot/listeners/CommandListener.java → app/src/main/java/de/yannicpunktdee/yoshibot/listeners/DiscordEventListener.java View File

@ -28,7 +28,7 @@ import java.util.concurrent.ConcurrentHashMap;
* *
* @author Yannic Link * @author Yannic Link
*/ */
public class CommandListener extends ListenerAdapter {
public class DiscordEventListener extends ListenerAdapter {
/** /**
* {@inheritDoc} * {@inheritDoc}
@ -57,6 +57,8 @@ public class CommandListener extends ListenerAdapter {
public void onGuildVoiceJoin(@NotNull GuildVoiceJoinEvent event) { public void onGuildVoiceJoin(@NotNull GuildVoiceJoinEvent event) {
super.onGuildVoiceJoin(event); super.onGuildVoiceJoin(event);
if(!Resources.isGreetings_and_byebyes_on()) return;
if(event.getMember().getUser().isBot()) return; if(event.getMember().getUser().isBot()) return;
PlayCommand.play( PlayCommand.play(
@ -68,6 +70,8 @@ public class CommandListener extends ListenerAdapter {
public void onGuildVoiceLeave(@NotNull GuildVoiceLeaveEvent event) { public void onGuildVoiceLeave(@NotNull GuildVoiceLeaveEvent event) {
super.onGuildVoiceLeave(event); super.onGuildVoiceLeave(event);
if(!Resources.isGreetings_and_byebyes_on()) return;
if(event.getMember().getUser().isBot()) return; if(event.getMember().getUser().isBot()) return;
PlayCommand.play( PlayCommand.play(

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

@ -10,7 +10,7 @@ import de.yannicpunktdee.yoshibot.audio.AudioSendHandlerImpl;
import de.yannicpunktdee.yoshibot.command.YoshiCommandContext; import de.yannicpunktdee.yoshibot.command.YoshiCommandContext;
import de.yannicpunktdee.yoshibot.command.YoshiCommandDistributor; import de.yannicpunktdee.yoshibot.command.YoshiCommandDistributor;
import de.yannicpunktdee.yoshibot.listeners.CommandLine; import de.yannicpunktdee.yoshibot.listeners.CommandLine;
import de.yannicpunktdee.yoshibot.listeners.CommandListener;
import de.yannicpunktdee.yoshibot.listeners.DiscordEventListener;
import de.yannicpunktdee.yoshibot.utils.Logger; import de.yannicpunktdee.yoshibot.utils.Logger;
import de.yannicpunktdee.yoshibot.utils.Resources; import de.yannicpunktdee.yoshibot.utils.Resources;
import de.yannicpunktdee.yoshibot.utils.SauceProvider; import de.yannicpunktdee.yoshibot.utils.SauceProvider;
@ -81,7 +81,7 @@ public class YoshiBot {
jdaBuilder = JDABuilder.createDefault(Resources.getJdaBuilderString()); jdaBuilder = JDABuilder.createDefault(Resources.getJdaBuilderString());
jdaBuilder.setAutoReconnect(true); jdaBuilder.setAutoReconnect(true);
jdaBuilder.addEventListeners(new CommandListener());
jdaBuilder.addEventListeners(new DiscordEventListener());
audioPlayerManager = new DefaultAudioPlayerManager(); audioPlayerManager = new DefaultAudioPlayerManager();
audioPlayerManager.registerSourceManager(new LocalAudioSourceManager()); audioPlayerManager.registerSourceManager(new LocalAudioSourceManager());


Loading…
Cancel
Save