Merge Greg's branch into the master branch #310

Merged
greg6775 merged 18 commits from greg-dev into master 2020-01-10 19:26:21 +01:00
3 changed files with 10 additions and 6 deletions
Showing only changes of commit c559c9cb56 - Show all commits

10
pom.xml
View file

@ -26,11 +26,11 @@
<artifactId>json</artifactId>
<version>20190722</version>
</dependency>
<dependency>
<groupId>com.rethinkdb</groupId>
<artifactId>rethinkdb-driver</artifactId>
<version>2.3.3</version>
</dependency>
<dependency>
<groupId>com.rethinkdb</groupId>
<artifactId>rethinkdb-driver</artifactId>
<version>2.3.3</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>

View file

@ -133,7 +133,10 @@ public class Rethink {
}
public void insertUser(String id) {
this.insert("user", r.hashMap("id", id).with("prefix", "h.").with("language", "en").with("blacklisted", "none"));
this.insert("user", r.hashMap("id", id)
.with("prefix", "h.")
.with("language", "en")
.with("blacklisted", "none"));
}
public void setBlackListed(String id, String commands) {

View file

@ -52,6 +52,7 @@ public class TrackManager extends AudioEventAdapter {
this.lastTrack = track;
Guild g = queue.poll().getAuthor().getGuild();
if (loop) {
player.playTrack(this.lastTrack.makeClone());
} else if (queue.isEmpty()) {
g.getAudioManager().closeAudioConnection();