Skip to content

Commit a61885d

Browse files
committed
Don't create player when missing on player update
Also move stack traces to trace level
1 parent 8e3b493 commit a61885d

File tree

3 files changed

+5
-36
lines changed

3 files changed

+5
-36
lines changed

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

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -399,27 +399,6 @@ class LavalinkNode(
399399
*/
400400
fun getCachedPlayer(guildId: Long): LavalinkPlayer? = playerCache[guildId]
401401

402-
/**
403-
* Gets a player from the local cache. If the player is not in the local cache, it will be created.
404-
*
405-
* @param guildId The guild id of the player.
406-
*
407-
* @return The local player. This player may not exist on the [LavalinkNode] yet.
408-
*/
409-
internal fun getOrAssumePlayer(guildId: Long): LavalinkPlayer {
410-
val cachedPlayer = playerCache[guildId]
411-
412-
if (cachedPlayer == null) {
413-
val newPlayer = newPlayer(this, guildId.toString())
414-
415-
playerCache[guildId] = newPlayer
416-
417-
return newPlayer
418-
}
419-
420-
return cachedPlayer
421-
}
422-
423402
override fun equals(other: Any?): Boolean {
424403
if (this === other) return true
425404
if (javaClass != other?.javaClass) return false

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,6 @@ import dev.arbjerg.lavalink.client.protocol.toCustom
55
import dev.arbjerg.lavalink.protocol.v4.*
66
import kotlin.math.min
77

8-
internal fun newPlayer(node: LavalinkNode, guildId: String) = LavalinkPlayer(node, Player(
9-
guildId = guildId,
10-
track = null,
11-
volume = 100,
12-
paused = false,
13-
state = PlayerState(0, 0, false, -1),
14-
voice = VoiceState("", "", ""),
15-
filters = Filters()
16-
))
17-
188
/**
199
* Represents a player that is tied to a guild.
2010
*/

src/main/kotlin/dev/arbjerg/lavalink/internal/LavalinkSocket.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,7 @@ class LavalinkSocket(private val node: LavalinkNode) : WebSocketListener(), Clos
7070
val update = event as Message.PlayerUpdateEvent
7171
val idLong = update.guildId.toLong()
7272

73-
// Create a local player on the node if we don't have one.
74-
// There probably is an edge-case where this will happen.
75-
node.getOrAssumePlayer(idLong).state = update.state
73+
node.getCachedPlayer(idLong)?.state = update.state
7674
node.lavalink.getLinkIfCached(idLong)?.state = if (update.state.connected) {
7775
LinkState.CONNECTED
7876
} else {
@@ -144,7 +142,8 @@ class LavalinkSocket(private val node: LavalinkNode) : WebSocketListener(), Clos
144142
}
145143

146144
is ConnectException -> {
147-
logger.error("Failed to connect to WS of ${node.name} (${node.baseUri}), retrying in ${reconnectInterval / 1000} seconds", t)
145+
logger.error("Failed to connect to WS of ${node.name} (${node.baseUri}), retrying in ${reconnectInterval / 1000} seconds")
146+
logger.trace("Failed to connect to WS of ${node.name} (${node.baseUri}), retrying in ${reconnectInterval / 1000} seconds", t)
148147
}
149148

150149
is SocketException -> {
@@ -154,7 +153,8 @@ class LavalinkSocket(private val node: LavalinkNode) : WebSocketListener(), Clos
154153
return
155154
}
156155

157-
logger.error("Socket error on ${node.name}, reconnecting in ${reconnectInterval / 1000} seconds", t)
156+
logger.error("Socket error on ${node.name}, reconnecting in ${reconnectInterval / 1000} seconds")
157+
logger.trace("Socket error on ${node.name}, reconnecting in ${reconnectInterval / 1000} seconds", t)
158158
node.available = false
159159
open = false
160160
}

0 commit comments

Comments
 (0)