fix websocket crash when seeking and nothing is playing

lavalink-devs · Oct 13, 2023 · 14c2137 · 14c2137
1 parent cb866b3
commit 14c2137
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/LavalinkServer/src/main/java/lavalink/server/io/WebSocketHandler.kt b/LavalinkServer/src/main/java/lavalink/server/io/WebSocketHandler.kt
@@ -127,6 +127,10 @@ class WebSocketHandler(
 
     private fun seek(json: JSONObject) {
         val player = context.getPlayer(json.getLong("guildId"))
+        if (!player.isPlaying) {
+            log.warn("Can't seek when player is not playing anything")
+            return
+        }
         player.seekTo(json.getLong("position"))
         SocketServer.sendPlayerUpdate(context, player)
     }

diff --git a/LavalinkServer/src/main/java/lavalink/server/player/PlayerRestHandler.kt b/LavalinkServer/src/main/java/lavalink/server/player/PlayerRestHandler.kt
@@ -121,7 +121,7 @@ class PlayerRestHandler(
         playerUpdate.position.takeIf { it.isPresent && !playerUpdate.encodedTrack.isPresent && !playerUpdate.identifier.isPresent }
             ?.let {
                 if (player.isPlaying) {
-                    player.seekTo(it)
+                    player.seekTo(it.value)
                     SocketServer.sendPlayerUpdate(context, player)
                 }
             }