cleanup

cylorun · Jun 11, 2024 · 84c2b6c · 84c2b6c
1 parent 927b7e5
commit 84c2b6c
Showing 1 changed file with 5 additions and 1 deletion.
diff --git 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<String, String> text = getText(currentSplit);
+            Pair<String, String> text = this.getText(currentSplit);
 
             return new DiscordRichPresence.Builder("Current Time: " + currentTime)
                     .setStartTimestamps(this.start)
@@ -85,6 +86,9 @@ private DiscordRichPresence getNewPresence() throws IOException {
         }
 
         Pair<Integer, String> 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());