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

Merge pull request #426 from BigBotNetwork/greg-dev

Browse source 
v1.3.4
This commit is contained in:
Skidder 2020-03-31 16:32:12 +02:00 • committed by GitHub
commit 48a453456e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/com/bbn/hadder/Rethink.java
View file

@ -78,7 +78,6 @@ public class Rethink {
public JSONObject getObjectByID(String table, String id) { public JSONObject getObjectByID(String table, String id) {
String response = r.table(table).get(id).toJson().run(conn); String response = r.table(table).get(id).toJson().run(conn);
System.out.println(response);
return new JSONObject(response); return new JSONObject(response);
} }

4
src/main/java/com/bbn/hadder/commands/music/PauseCommand.java
View file

@ -34,8 +34,8 @@ public class PauseCommand implements Command {
.build()).queue(); .build()).queue();
} else { } else {
e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
"commands.music.pause.error.paused.title", "commands.music.pause.error.paused.title", "",
"commands.music.pause.error.paused.description") "commands.music.pause.error.paused.description", e.getRethinkServer().getPrefix())
.build()).queue(); .build()).queue();
} }
} else { } else {

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

@ -274,7 +274,7 @@ commands.music.volume.help.description = Change the volume of the music.
commands.music.pause.success.title = Successfully paused commands.music.pause.success.title = Successfully paused
commands.music.pause.success.description = I successfully paused the played song. commands.music.pause.success.description = I successfully paused the played song.
commands.music.pause.error.paused.title = Already paused commands.music.pause.error.paused.title = Already paused
commands.music.pause.error.paused.description = The song is already paused. commands.music.pause.error.paused.description = The song is already paused. You can continue playing it with %extra%play
commands.music.pause.error.connected.title = No channel commands.music.pause.error.connected.title = No channel
commands.music.pause.error.connected.description = You have to be in the same voice channel as the bot to pause the song. commands.music.pause.error.connected.description = You have to be in the same voice channel as the bot to pause the song.
commands.music.pause.help.description = Pause the playing song. commands.music.pause.help.description = Pause the playing song.