From 92fab136f6bc02536cd89a190e05727c08ec5c1e Mon Sep 17 00:00:00 2001 From: Skydust Date: Fri, 4 Jun 2021 01:45:19 +0200 Subject: [PATCH] =?UTF-8?q?2-3=20modifications=20tr=C3=A8s=20l=C3=A9g?= =?UTF-8?q?=C3=A8res=20Bump=20de=20la=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/fr/Skydust/JdrBot/JdrBot.java | 2 +- src/main/java/fr/Skydust/JdrBot/JdrBotListener.java | 1 - src/main/java/fr/Skydust/JdrBot/audio/TrackScheduler.java | 1 - src/main/java/fr/Skydust/JdrBot/cmds/Emote.java | 2 +- src/main/java/fr/Skydust/JdrBot/cmds/LastTimeOnline.java | 2 +- src/main/java/fr/Skydust/JdrBot/cmds/playmusic/FLoad.java | 2 +- src/main/java/fr/Skydust/JdrBot/cmds/playmusic/FLoadLoop.java | 2 +- 7 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/fr/Skydust/JdrBot/JdrBot.java b/src/main/java/fr/Skydust/JdrBot/JdrBot.java index b2c8d25..bf407ee 100755 --- a/src/main/java/fr/Skydust/JdrBot/JdrBot.java +++ b/src/main/java/fr/Skydust/JdrBot/JdrBot.java @@ -17,7 +17,7 @@ import net.dv8tion.jda.api.entities.Activity; import net.dv8tion.jda.api.utils.cache.CacheFlag; public class JdrBot { - public static String Version = "2.61"; + public static String Version = "2.62"; public static JDA jda; public static LocalDateTime basedate; diff --git a/src/main/java/fr/Skydust/JdrBot/JdrBotListener.java b/src/main/java/fr/Skydust/JdrBot/JdrBotListener.java index 8c1ee33..759df22 100755 --- a/src/main/java/fr/Skydust/JdrBot/JdrBotListener.java +++ b/src/main/java/fr/Skydust/JdrBot/JdrBotListener.java @@ -15,7 +15,6 @@ import net.dv8tion.jda.api.events.user.update.UserUpdateOnlineStatusEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; public class JdrBotListener extends ListenerAdapter { - Random r = new Random(); @Override diff --git a/src/main/java/fr/Skydust/JdrBot/audio/TrackScheduler.java b/src/main/java/fr/Skydust/JdrBot/audio/TrackScheduler.java index 4f78b3c..cc49278 100755 --- a/src/main/java/fr/Skydust/JdrBot/audio/TrackScheduler.java +++ b/src/main/java/fr/Skydust/JdrBot/audio/TrackScheduler.java @@ -35,7 +35,6 @@ public class TrackScheduler extends AudioEventAdapter { System.out.println("Launching track:"+track.getInfo().title); } else { stop(); - //am.closeAudioConnection(); } } } diff --git a/src/main/java/fr/Skydust/JdrBot/cmds/Emote.java b/src/main/java/fr/Skydust/JdrBot/cmds/Emote.java index 86b58e8..400797c 100755 --- a/src/main/java/fr/Skydust/JdrBot/cmds/Emote.java +++ b/src/main/java/fr/Skydust/JdrBot/cmds/Emote.java @@ -15,7 +15,7 @@ public class Emote extends Command { public void call(GuildMessageReceivedEvent e) { String[] args = Arrays.copyOfRange(e.getMessage().getContentRaw().split(" "), 1, e.getMessage().getContentRaw().split(" ").length); - String str = (String)args[0]; + String str = args[0]; if(str.matches("<:.*:\\d+>")) { String id = str.replaceAll("<:.*:(\\d+)>", "$1"); diff --git a/src/main/java/fr/Skydust/JdrBot/cmds/LastTimeOnline.java b/src/main/java/fr/Skydust/JdrBot/cmds/LastTimeOnline.java index 7667223..7fe3869 100755 --- a/src/main/java/fr/Skydust/JdrBot/cmds/LastTimeOnline.java +++ b/src/main/java/fr/Skydust/JdrBot/cmds/LastTimeOnline.java @@ -12,7 +12,7 @@ import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent; import net.dv8tion.jda.api.events.user.update.UserUpdateOnlineStatusEvent; public class LastTimeOnline extends Command { - static HashMap AllUsers = new HashMap(); + static HashMap AllUsers = new HashMap<>(); public LastTimeOnline() { SetName("lasttimeonline|lto"); diff --git a/src/main/java/fr/Skydust/JdrBot/cmds/playmusic/FLoad.java b/src/main/java/fr/Skydust/JdrBot/cmds/playmusic/FLoad.java index 8788056..45efb03 100755 --- a/src/main/java/fr/Skydust/JdrBot/cmds/playmusic/FLoad.java +++ b/src/main/java/fr/Skydust/JdrBot/cmds/playmusic/FLoad.java @@ -18,7 +18,7 @@ public class FLoad extends Command { @Override public void call(GuildMessageReceivedEvent e) { - if(e.getGuild().getMember(e.getAuthor()).getVoiceState().getChannel() != null) { + if(e.getMember().getVoiceState().getChannel() != null) { String args = StringUtils.join(Arrays.copyOfRange(e.getMessage().getContentRaw().split(" "), 1, e.getMessage().getContentRaw().split(" ").length), " "); e.getGuild().getAudioManager().openAudioConnection(e.getMember().getVoiceState().getChannel()); diff --git a/src/main/java/fr/Skydust/JdrBot/cmds/playmusic/FLoadLoop.java b/src/main/java/fr/Skydust/JdrBot/cmds/playmusic/FLoadLoop.java index 522c05d..db22f02 100755 --- a/src/main/java/fr/Skydust/JdrBot/cmds/playmusic/FLoadLoop.java +++ b/src/main/java/fr/Skydust/JdrBot/cmds/playmusic/FLoadLoop.java @@ -18,7 +18,7 @@ public class FLoadLoop extends Command { @Override public void call(GuildMessageReceivedEvent e) { - if(e.getGuild().getMember(e.getAuthor()).getVoiceState().getChannel() != null) { + if(e.getMember().getVoiceState().getChannel() != null) { String args = StringUtils.join(Arrays.copyOfRange(e.getMessage().getContentRaw().split(" "), 1, e.getMessage().getContentRaw().split(" ").length)," "); e.getGuild().getAudioManager().openAudioConnection(e.getMember().getVoiceState().getChannel());