greg6775/Hadder
1
0
Fork 0
Code Issues 9 Pull requests 5 Projects Releases 54 Packages Wiki Activity Actions

Some stuff yk #315

Merged
greg6775 merged 2 commits from greg-dev into master 2020-01-11 19:02:35 +01:00
Conversation 0 Commits 2 Files changed 3 +5 -5
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/bbn/hadder/audio/TrackManager.java
View file

@ -48,13 +48,13 @@ public class TrackManager extends AudioEventAdapter {
@Override @Override
public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) { public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) {
Guild g = queue.poll().getAuthor().getGuild(); Guild g = queue.element().getAuthor().getGuild();
if (loop) { if (loop) {
player.playTrack(track.makeClone()); player.playTrack(track.makeClone());
} else if (queue.isEmpty()) { } else if (queue.isEmpty()) {
g.getAudioManager().closeAudioConnection(); g.getAudioManager().closeAudioConnection();
} else { } else {
player.playTrack(queue.element().getTrack()); player.playTrack(queue.element().getTrack().makeClone());
} }
} }

2
src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java
View file

@ -36,7 +36,7 @@ public class RoleCommand implements Command {
event.getMessageEditor().getMessage( event.getMessageEditor().getMessage(
MessageEditor.MessageType.INFO, MessageEditor.MessageType.INFO,
"commands.moderation.role.add.success.title", "commands.moderation.role.add.success.title",
"✅", "",
"", "",
"commands.moderation.role.add.success.description", "commands.moderation.role.add.success.description",
String.valueOf(event.getMessage().getMentionedRoles().size()), String.valueOf(event.getMessage().getMentionedRoles().size()),

4
src/main/resources/Translations/Translations_en.properties
View file

@ -121,9 +121,9 @@ commands.moderation.regionchange.regions.title = All regions
commands.moderation.regionchange.success.title = Successfully set region 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.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.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.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.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.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 commands.moderation.rules.setup.title = Set up rules