Skip to content

Commit 5aff6a0

Browse files
committed
Shitty attempt at fixing the singleton issue
1 parent f1bccb6 commit 5aff6a0

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ plugins {
3535
id("org.jmailen.kotlinter") version "3.5.1"
3636
}
3737

38-
val numberVersion = "3.106.4"
38+
val numberVersion = "3.106.5"
3939

4040
project.group = "ml.duncte123.skybot"
4141
project.version = "${numberVersion}_${getGitHash()}"

src/main/java/fredboat/audio/player/LavalinkManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public final class LavalinkManager {
4949
private LavalinkManager() {
5050
}
5151

52-
public void start(DunctebotConfig config, AudioUtils audioUtils) {
52+
public void start(SkyBot skybot, DunctebotConfig config, AudioUtils audioUtils) {
5353
this.config = config;
5454
this.audioUtils = audioUtils;
5555

@@ -62,7 +62,7 @@ public void start(DunctebotConfig config, AudioUtils audioUtils) {
6262
lavalink = new JdaLavalink(
6363
userId,
6464
this.config.discord.totalShards,
65-
shardId -> SkyBot.getInstance().getShardManager().getShardById(shardId)
65+
shardId -> skybot.getShardManager().getShardById(shardId)
6666
);
6767

6868
loadNodes();

src/main/java/ml/duncte123/skybot/SkyBot.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,11 @@ public final class SkyBot {
6464
member.getRoles().stream().anyMatch((role) -> role.getIdLong() == Settings.PATRONS_ROLE);
6565
};
6666

67+
// Sigh, might need to convert this to spring
68+
@SuppressWarnings("PMD.AssignmentToNonFinalStatic")
6769
private SkyBot() throws LoginException {
70+
instance = this;
71+
6872
// Load in our container
6973
final Variables variables = new Variables();
7074

@@ -93,7 +97,7 @@ private SkyBot() throws LoginException {
9397
final LongLongPair commandCount = commandManager.getCommandCount();
9498

9599
logger.info("{} commands with {} aliases loaded.", commandCount.getFirst(), commandCount.getSecond());
96-
LavalinkManager.INS.start(config, variables.getAudioUtils());
100+
LavalinkManager.INS.start(this, config, variables.getAudioUtils());
97101

98102
final EventManager eventManager = new EventManager(variables);
99103
// Build our shard manager
@@ -181,7 +185,7 @@ public WebSocketClient getWebsocketClient() {
181185
}
182186

183187
public static void main(final String[] args) throws LoginException {
184-
instance = new SkyBot();
188+
new SkyBot();
185189
}
186190

187191
public static SkyBot getInstance() {

0 commit comments

Comments
 (0)