From 84c2b6c65aca8616175dac366ef347e78e0afb07 Mon Sep 17 00:00:00 2001 From: cylorun Date: Tue, 11 Jun 2024 14:30:47 +0000 Subject: [PATCH] cleanup --- src/main/java/me/cylorun/pace/rpc/DiscordStatus.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/me/cylorun/pace/rpc/DiscordStatus.java b/src/main/java/me/cylorun/pace/rpc/DiscordStatus.java index c266895..046873f 100644 --- a/src/main/java/me/cylorun/pace/rpc/DiscordStatus.java +++ b/src/main/java/me/cylorun/pace/rpc/DiscordStatus.java @@ -34,6 +34,7 @@ public void init() { public void updatePresence() throws IOException { DiscordRichPresence p = this.getNewPresence(); if (p == null) { + DiscordRPC.discordClearPresence(); return; } DiscordRPC.discordUpdatePresence(p); @@ -74,7 +75,7 @@ private DiscordRichPresence getNewPresence() throws IOException { JsonObject latestEvent = eventList.get(eventList.size() - 1).getAsJsonObject(); String currentSplit = latestEvent.get("eventId").getAsString(); String currentTime = PaceMan.formatTime(Integer.parseInt(latestEvent.get("igt").getAsString())); - Pair text = getText(currentSplit); + Pair text = this.getText(currentSplit); return new DiscordRichPresence.Builder("Current Time: " + currentTime) .setStartTimestamps(this.start) @@ -85,6 +86,9 @@ private DiscordRichPresence getNewPresence() throws IOException { } Pair stats = this.getStats(); + if (stats == null) { + return null; + } String enters = stats.getLeft() == null || !options.show_enter_avg ? "" : String.format("Enters: %s", stats.getLeft()); String avg = stats.getRight() == null || !options.show_enter_avg ? "" : String.format("Enter Avg: %s", stats.getRight());