Skip to content

Commit 7f656c3

Browse files
committed
Amend the last commit to not break things
1 parent eb36c7d commit 7f656c3

File tree

1 file changed

+14
-17
lines changed

1 file changed

+14
-17
lines changed

LavalinkClient/src/main/java/lavalink/client/player/LavalinkPlayer.java

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -82,21 +82,19 @@ public void playTrack(AudioTrack track) {
8282
try {
8383
position = track.getPosition();
8484
TrackData trackData = track.getUserData(TrackData.class);
85-
LavalinkSocket node = link.getNode(false);
86-
87-
if (node != null) {
88-
JSONObject json = new JSONObject();
89-
json.put("op", "play");
90-
json.put("guildId", link.getGuildId());
91-
json.put("track", LavalinkUtil.toMessage(track));
92-
json.put("startTime", position);
93-
if (trackData != null) {
94-
json.put("startTime", trackData.startPos);
95-
json.put("endTime", trackData.endPos);
96-
}
97-
json.put("pause", paused);
98-
node.send(json.toString());
85+
86+
JSONObject json = new JSONObject();
87+
json.put("op", "play");
88+
json.put("guildId", link.getGuildId());
89+
json.put("track", LavalinkUtil.toMessage(track));
90+
json.put("startTime", position);
91+
if (trackData != null) {
92+
json.put("startTime", trackData.startPos);
93+
json.put("endTime", trackData.endPos);
9994
}
95+
json.put("pause", paused);
96+
//noinspection ConstantConditions
97+
link.getNode(true).send(json.toString());
10098

10199
updateTime = System.currentTimeMillis();
102100
this.track = track;
@@ -161,14 +159,13 @@ public long getTrackPosition() {
161159
public void seekTo(long position) {
162160
if (getPlayingTrack() == null) throw new IllegalStateException("Not currently playing anything");
163161
if (!getPlayingTrack().isSeekable()) throw new IllegalStateException("Track cannot be seeked");
164-
LavalinkSocket node = link.getNode(false);
165-
if (node == null) return;
166162

167163
JSONObject json = new JSONObject();
168164
json.put("op", "seek");
169165
json.put("guildId", link.getGuildId());
170166
json.put("position", position);
171-
node.send(json.toString());
167+
//noinspection ConstantConditions
168+
link.getNode(true).send(json.toString());
172169
}
173170

174171
@Override

0 commit comments

Comments
 (0)