From cec16b73dcf6f866e589b985583b5099687eb8bb Mon Sep 17 00:00:00 2001 From: Yannic Link Date: Tue, 6 Apr 2021 16:21:55 +0200 Subject: [PATCH] Follow Teil 2 Resolved Merge Conflicts --- .../yoshibot/command/YoshiCommandDistributor.java | 3 +-- .../yoshibot/listeners/DiscordEventListener.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/de/yannicpunktdee/yoshibot/command/YoshiCommandDistributor.java b/app/src/main/java/de/yannicpunktdee/yoshibot/command/YoshiCommandDistributor.java index c9a97a4..b2a74d9 100644 --- a/app/src/main/java/de/yannicpunktdee/yoshibot/command/YoshiCommandDistributor.java +++ b/app/src/main/java/de/yannicpunktdee/yoshibot/command/YoshiCommandDistributor.java @@ -115,8 +115,7 @@ public class YoshiCommandDistributor { PAT, BONK, FOLLOW, - WIKIPEDIA, - BONK + WIKIPEDIA } diff --git a/app/src/main/java/de/yannicpunktdee/yoshibot/listeners/DiscordEventListener.java b/app/src/main/java/de/yannicpunktdee/yoshibot/listeners/DiscordEventListener.java index 4d17d8f..4e28893 100644 --- a/app/src/main/java/de/yannicpunktdee/yoshibot/listeners/DiscordEventListener.java +++ b/app/src/main/java/de/yannicpunktdee/yoshibot/listeners/DiscordEventListener.java @@ -61,7 +61,7 @@ public class DiscordEventListener extends ListenerAdapter { if(nameToPlay == null) nameToPlay = event.getMember().getUser().getName(); PlayCommand.play( - SayCommand.buildTTSAudio(Resources.getRandomGreeting(nameToPlay)), + YoshiCommand.buildTTSAudio(Resources.getRandomGreeting(nameToPlay)), event.getMember().getVoiceState().getChannel()); } } @@ -82,7 +82,7 @@ public class DiscordEventListener extends ListenerAdapter { nameToPlay = nameToPlay == null ? event.getMember().getUser().getName() : nameToPlay; PlayCommand.play( - SayCommand.buildTTSAudio(Resources.getRandomByebye(nameToPlay)), + YoshiCommand.buildTTSAudio(Resources.getRandomByebye(nameToPlay)), event.getChannelLeft()); } }