From 8f1813dbe268ead2917c451265493e3976b9a249 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 11 Jan 2020 18:24:57 +0100 Subject: [PATCH 1/2] ? --- src/main/java/com/bbn/hadder/audio/TrackManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/bbn/hadder/audio/TrackManager.java b/src/main/java/com/bbn/hadder/audio/TrackManager.java index 08a1363..91fa146 100644 --- a/src/main/java/com/bbn/hadder/audio/TrackManager.java +++ b/src/main/java/com/bbn/hadder/audio/TrackManager.java @@ -48,13 +48,13 @@ public class TrackManager extends AudioEventAdapter { @Override public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) { - Guild g = queue.poll().getAuthor().getGuild(); + Guild g = queue.element().getAuthor().getGuild(); if (loop) { player.playTrack(track.makeClone()); } else if (queue.isEmpty()) { g.getAudioManager().closeAudioConnection(); } else { - player.playTrack(queue.element().getTrack()); + player.playTrack(queue.element().getTrack().makeClone()); } } From 3c39c70f43a92c49cf6fc040f51e1f8f8f843747 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 11 Jan 2020 18:26:36 +0100 Subject: [PATCH 2/2] =?UTF-8?q?Remove=20=E2=9C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bbn/hadder/commands/moderation/RoleCommand.java | 2 +- src/main/resources/Translations/Translations_en.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java index b5049ec..47842e8 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java @@ -36,7 +36,7 @@ public class RoleCommand implements Command { event.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.role.add.success.title", - "✅", + "", "", "commands.moderation.role.add.success.description", String.valueOf(event.getMessage().getMentionedRoles().size()), diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 6e2760e..25d8c0d 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -121,9 +121,9 @@ commands.moderation.regionchange.regions.title = All regions commands.moderation.regionchange.success.title = Successfully set region commands.moderation.regionchange.success.description = I successfully set the new server region to %extra%. commands.moderation.regionchange.help.description = Changes the server region to locked regions. -commands.moderation.role.add.success.title = %extra% Successfully added role(s) %extra% +commands.moderation.role.add.success.title = Successfully added role(s) commands.moderation.role.add.success.description = I successfully added %extra% roles to %extra_two% members. -commands.moderation.role.remove.success.title = %extra% Successfully removed role(s) %extra% +commands.moderation.role.remove.success.title = Successfully removed role(s) commands.moderation.role.remove.success.description = I successfully removed %extra% roles from %extra_two% members. commands.moderation.role.help.description = Adds and removes one or more role(s) from one or more user(s) commands.moderation.rules.setup.title = Set up rules