Make the enabled option actually do something, remove null check on c…

…lient init
lavalink-devs · May 8, 2024 · 3558355 · 3558355
1 parent 5b586be
commit 3558355
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/common/src/main/java/dev/lavalink/youtube/YoutubeAudioSourceManager.java b/common/src/main/java/dev/lavalink/youtube/YoutubeAudioSourceManager.java
@@ -124,7 +124,7 @@ public YoutubeAudioSourceManager(boolean allowSearch,
         this.allowSearch = allowSearch;
         this.allowDirectVideoIds = allowDirectVideoIds;
         this.allowDirectPlaylistIds = allowDirectPlaylistIds;
-        this.clients = clients == null ? new Client[0] : clients;
+        this.clients = clients;
         this.cipherManager = new SignatureCipherManager();
 
         YoutubeAccessTokenTracker tokenTracker = new YoutubeAccessTokenTracker(httpInterfaceManager);

diff --git a/plugin/src/main/java/dev/lavalink/youtube/plugin/YoutubePluginLoader.java b/plugin/src/main/java/dev/lavalink/youtube/plugin/YoutubePluginLoader.java
@@ -127,6 +127,10 @@ private AbstractRoutePlanner getRoutePlanner() {
 
     @Override
     public AudioPlayerManager configure(AudioPlayerManager audioPlayerManager) {
+        if (youtubeConfig != null && !youtubeConfig.getEnabled()) {
+            return audioPlayerManager;
+        }
+
         final YoutubeAudioSourceManager source;
         final boolean allowSearch = youtubeConfig == null || youtubeConfig.getAllowSearch();
         final boolean allowDirectVideoIds = youtubeConfig == null || youtubeConfig.getAllowDirectVideoIds();