From 6a84f3759a2ea404c9fe877fbbd88ffbca012edd Mon Sep 17 00:00:00 2001
From: Alex <github@alexstewart.app>
Date: Fri, 18 Oct 2019 03:11:01 -0400
Subject: [PATCH] =Updates

---
 src/commands/music/SubCommandAddTrack.java |  9 ++-
 src/dataStructures/KittyGuild.java         |  2 +-
 src/utils/audio/AudioController.java       | 71 ++++++++++------------
 src/utils/audio/GuildMusicManager.java     |  6 +-
 4 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/src/commands/music/SubCommandAddTrack.java b/src/commands/music/SubCommandAddTrack.java
index d8f7472..575bd00 100644
--- a/src/commands/music/SubCommandAddTrack.java
+++ b/src/commands/music/SubCommandAddTrack.java
@@ -25,8 +25,11 @@ public class SubCommandAddTrack extends SubCommand
 		//Get track from Youtube 
 		String video = YT.getYT(input.args);
 		ac.loadAndPlay(video, guild);
-		
-		System.out.println(ac.response);
-		return new SubCommandFormattable(video);
+        try {
+            Thread.sleep(2000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+		return new SubCommandFormattable(ac.response);
 	}
 }
\ No newline at end of file
diff --git a/src/dataStructures/KittyGuild.java b/src/dataStructures/KittyGuild.java
index 4369490..d989348 100644
--- a/src/dataStructures/KittyGuild.java
+++ b/src/dataStructures/KittyGuild.java
@@ -58,7 +58,7 @@ public class KittyGuild extends DatabaseTrackedObject
 		roleList = new KittyTrackedVector(roleListName, uniqueID);
 		beans = new KittyTrackedLong(beansName, uniqueID);
 		registerTrackedObjects();
-		musicManager = new GuildMusicManager(playerManager);
+		musicManager = new GuildMusicManager(playerManager, this);
 		
 		control = adminControl;
 		this.contentRating = KittyRating.Safe; 
diff --git a/src/utils/audio/AudioController.java b/src/utils/audio/AudioController.java
index 011cf49..0754180 100644
--- a/src/utils/audio/AudioController.java
+++ b/src/utils/audio/AudioController.java
@@ -25,56 +25,49 @@ public class AudioController
 	
 	public void loadAndPlay(final String trackUrl, KittyGuild guild) 
 	{
-		synchronized(response)
-		{
-			GuildMusicManager musicManager = guild.musicManager;
+	    GuildMusicManager musicManager = guild.musicManager;
 
-		    playerManager.loadItemOrdered(musicManager, trackUrl, new AudioLoadResultHandler() 
-		    {
-		      @Override
-		      public void trackLoaded(AudioTrack track) 
-		      {
-		        response = "Adding to queue " + track.getInfo().title;
-		        System.out.println("QUEUED");
-		        play(musicManager, track);
-		      }
+	    playerManager.loadItemOrdered(musicManager, trackUrl, new AudioLoadResultHandler() 
+	    {
+	      @Override
+	      public void trackLoaded(AudioTrack track) 
+	      {
+	        response = "Adding to queue " + track.getInfo().title;
+	        play(musicManager, track);
+	      }
 
-		      @Override
-		      public void playlistLoaded(AudioPlaylist playlist) 
-		      {
-		    	AudioTrack firstTrack = playlist.getSelectedTrack();
+	      @Override
+	      public void playlistLoaded(AudioPlaylist playlist) 
+	      {
+	    	AudioTrack firstTrack = playlist.getSelectedTrack();
 
-		    	if (firstTrack == null) 
-		    	{
-		    		  firstTrack = playlist.getTracks().get(0);
-		    	}
+	    	if (firstTrack == null) 
+	    	{
+	    		  firstTrack = playlist.getTracks().get(0);
+	    	}
 
-		    	response = "Adding to queue " + firstTrack.getInfo().title + " (first track of playlist " + playlist.getName() + ")";
+	    	response = "Adding to queue " + firstTrack.getInfo().title + " (first track of playlist " + playlist.getName() + ")";
 
-		    	play(musicManager, firstTrack);
-		      }
+	    	play(musicManager, firstTrack);
+	      }
 
-		      @Override
-		      public void noMatches() 
-		      {
-		    	  System.out.println("NOT QUEUED");
-		    	  response = "Nothing found by " + trackUrl;
-		      }
+	      @Override
+	      public void noMatches() 
+	      {
+	    	  response = "Nothing found by " + trackUrl;
+	      }
 
-		      @Override
-		      public void loadFailed(FriendlyException exception) 
-		      {
-		    	  System.out.println("EXCEPTION");
-		    	  System.out.println(exception.getCause());
-		      }
-		    });
-		}
-	    
+	      @Override
+	      public void loadFailed(FriendlyException exception) 
+	      {
+	    	  System.out.println(exception.getCause());
+	      }
+	    });
 	  }
 
 	  private void play(GuildMusicManager musicManager, AudioTrack track) 
 	  {
-		  
+		  System.out.println(musicManager.guildName);
 		  musicManager.scheduler.queue(track);
 	  }
 
diff --git a/src/utils/audio/GuildMusicManager.java b/src/utils/audio/GuildMusicManager.java
index 599f513..b499517 100644
--- a/src/utils/audio/GuildMusicManager.java
+++ b/src/utils/audio/GuildMusicManager.java
@@ -3,6 +3,8 @@ package utils.audio;
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
 
+import dataStructures.KittyGuild;
+
 /**
  * Holder for both the player and a track scheduler for one guild.
  */
@@ -15,16 +17,18 @@ public class GuildMusicManager {
    * Track scheduler for the player.
    */
   public final TrackScheduler scheduler;
+  public final String guildName; 
 
   /**
    * Creates a player and a track scheduler.
    * @param manager Audio player manager to use for creating the player.
    */
-  public GuildMusicManager(AudioPlayerManager manager) 
+  public GuildMusicManager(AudioPlayerManager manager, KittyGuild guild) 
   {
     player = manager.createPlayer();
     scheduler = new TrackScheduler(player);
     player.addListener(scheduler);
+    guildName = guild.uniqueID;
   }
 
   /**