From f225145602b89bf9ce5e0123bf2038fe59e59db6 Mon Sep 17 00:00:00 2001
From: Pinapelz <donaldshan1@outlook.com>
Date: Sun, 13 Aug 2023 23:53:52 -0700
Subject: fix: Bot connects but fails to load audio - Downgrade lavaplayer-fork
 - Simplify queue code

---
 pom.xml                                 | 2 +-
 src/main/java/audio/Music.java          | 2 ++
 src/main/java/audio/TrackScheduler.java | 9 ++-------
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index e6b764f..f2e211a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>com.github.walkyst</groupId>
       <artifactId>lavaplayer-fork</artifactId>
-      <version>1.4.2</version>
+      <version>1.4.1</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.json-simple</groupId>
diff --git a/src/main/java/audio/Music.java b/src/main/java/audio/Music.java
index 986c9fc..65e3564 100644
--- a/src/main/java/audio/Music.java
+++ b/src/main/java/audio/Music.java
@@ -28,6 +28,7 @@ import net.dv8tion.jda.api.interactions.components.selections.SelectOption;
 
 import net.dv8tion.jda.api.interactions.components.selections.StringSelectMenu;
 import net.dv8tion.jda.api.managers.AudioManager;
+import net.dv8tion.jda.api.requests.GatewayIntent;
 import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
 import utility.*;
 import javax.security.auth.login.LoginException;
@@ -64,6 +65,7 @@ public class Music extends ListenerAdapter {
         this.playerManager = new DefaultAudioPlayerManager();
         jdabuilder = JDABuilder.createDefault(discordToken);
         try {
+            jdabuilder.enableIntents(GatewayIntent.MESSAGE_CONTENT);
             jdabuilder.addEventListeners(this);
             jdabuilder.addEventListeners(new CommandManager(this));
             jda = jdabuilder.build();
diff --git a/src/main/java/audio/TrackScheduler.java b/src/main/java/audio/TrackScheduler.java
index cbf4742..4045bb5 100644
--- a/src/main/java/audio/TrackScheduler.java
+++ b/src/main/java/audio/TrackScheduler.java
@@ -34,16 +34,10 @@ public class TrackScheduler extends AudioEventAdapter {
      * @param track The track to play or add to queue.
      */
     public void queue(AudioTrack track) {
-        //!player.startTrack(track, true)
-        if (player.getPlayingTrack()!= null) {
+        if (!player.startTrack(track, true)) {
             queue.offer(track);
             jda.getPresence().setActivity(Activity.playing(player.getPlayingTrack().getInfo().title));
         }
-        else{
-            player.startTrack(track, true);
-            jda.getPresence().setActivity(Activity.playing(player.getPlayingTrack().getInfo().title));
-        }
-
     }
 
     /**
@@ -56,6 +50,7 @@ public class TrackScheduler extends AudioEventAdapter {
     @Override
     public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) {
         jda.getPresence().setActivity(null);
+        System.out.println("Track ended because " + endReason.toString());
         if (endReason.mayStartNext) {
             jda.getPresence().setActivity(Activity.playing(track.getInfo().title));
             nextTrack();
-- 
cgit v1.2.3