aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorTacoMonkey <75862693+TacoMonkey11@users.noreply.github.com>2022-01-28 15:44:09 -0500
committerTacoMonkey <75862693+TacoMonkey11@users.noreply.github.com>2022-01-28 15:44:09 -0500
commited0a43ee63fb6a92ec1b81e99ddc0f3aa2625dce (patch)
tree09b822e73a654a2b0611e8c5cae8313d013b7d6d /src/main/java
parent8b5e1e46efe78cedaa4ccfa488b28f6a43b8aa1b (diff)
downloadSkyblocker-ed0a43ee63fb6a92ec1b81e99ddc0f3aa2625dce.tar.gz
Skyblocker-ed0a43ee63fb6a92ec1b81e99ddc0f3aa2625dce.tar.bz2
Skyblocker-ed0a43ee63fb6a92ec1b81e99ddc0f3aa2625dce.zip
Fixed startup spam for DiscordRPC
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java2
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/discord/DiscordRPCManager.java9
2 files changed, 10 insertions, 1 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
index ceb55549..a451088d 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
@@ -44,7 +44,7 @@ public class SkyblockerMod {
}
if (client.world != null && !client.isInSingleplayer())
Utils.sbChecker();
- if (!discordRPCManager.isConnected && Utils.isSkyblock && SkyblockerConfig.get().general.richPresence.enableRichPresence) discordRPCManager.start();
+ if (!discordRPCManager.isConnected && Utils.isSkyblock && SkyblockerConfig.get().general.richPresence.enableRichPresence && client.world != null && !client.isInSingleplayer()) discordRPCManager.start();
if (discordRPCManager.isConnected && !SkyblockerConfig.get().general.richPresence.enableRichPresence) discordRPCManager.stop();
if (client.world == null || client.isInSingleplayer() || !Utils.isSkyblock) if (discordRPCManager.isConnected)discordRPCManager.stop();
ticks = 0;
diff --git a/src/main/java/me/xmrvizzy/skyblocker/discord/DiscordRPCManager.java b/src/main/java/me/xmrvizzy/skyblocker/discord/DiscordRPCManager.java
index fc151371..d80e51f0 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/discord/DiscordRPCManager.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/discord/DiscordRPCManager.java
@@ -1,5 +1,6 @@
package me.xmrvizzy.skyblocker.discord;
+import com.google.gson.JsonObject;
import com.jagrosh.discordipc.IPCClient;
import com.jagrosh.discordipc.IPCListener;
import com.jagrosh.discordipc.entities.RichPresence;
@@ -54,6 +55,7 @@ public class DiscordRPCManager implements IPCListener{
}
public void stop(){
+ logger.info("Closing...");
isConnected = false;
client.close();
client = null;
@@ -64,4 +66,11 @@ public class DiscordRPCManager implements IPCListener{
logger.info("Started!");
isConnected = true;
}
+
+ @Override
+ public void onClose(IPCClient client, JsonObject json) {
+ logger.info("Closed");
+ isConnected = false;
+ }
+
}