Remove links that have their players destroyed

Author: duncte123

src/main/kotlin/dev/arbjerg/lavalink/client/LavalinkClient.kt

@@ -178,6 +178,10 @@ class LavalinkClient(val userId: Long) : Closeable, Disposable {
         close()
     }
 
+    internal fun removeDestroyedLink(guildId: Long) {
+        linkMap.remove(guildId)
+    }
+
     private fun listenForNodeEvent(node: LavalinkNode) {
         node.on<ClientEvent<Message>>()
             .subscribe {

src/main/kotlin/dev/arbjerg/lavalink/client/LavalinkNode.kt

@@ -158,7 +158,7 @@ class LavalinkNode(
     fun createOrUpdatePlayer(guildId: Long) = PlayerUpdateBuilder(this, guildId)
 
     /**
-     * Destroy a guild's player.
+     * Destroy a guild's player. This will also remove the associated link from the client.
      *
      * @param guildId The guild id of the player to destroy.
      */
@@ -173,6 +173,7 @@ class LavalinkNode(
 
     internal fun removeCachedPlayer(guildId: Long) {
         playerCache.remove(guildId)
+        lavalink.removeDestroyedLink(guildId)
     }
 
     /**

src/main/kotlin/dev/arbjerg/lavalink/client/Link.kt

@@ -27,7 +27,7 @@ class Link(
     fun getPlayer() = node.getPlayer(guildId)
 
     /**
-     * Destroys the player for this link.
+     * Destroys the player for this link. This will also remove the link from the client.
      */
     fun destroyPlayer() = node.destroyPlayer(guildId)
 
@@ -52,7 +52,7 @@ class Link(
             node.removeCachedPlayer(guildId)
             newNode.createOrUpdatePlayer(guildId)
                 .applyBuilder(player.stateToBuilder())
-                .block()
+                .subscribe()
         }
 
         node = newNode

src/main/kotlin/dev/arbjerg/lavalink/libraries/jda/JDAVoiceUpdateListener.kt

@@ -30,7 +30,7 @@ class JDAVoiceUpdateListener(private val lavalink: LavalinkClient) : VoiceDispat
                 link.state = LinkState.CONNECTED
             } else {
                 link.state = LinkState.DISCONNECTED
-                link.destroyPlayer().block()
+                link.destroyPlayer().subscribe()
             }
         }