From aebb3f8aa45e8337aaa6fc957502b0d3fa4d45fc Mon Sep 17 00:00:00 2001
From: Claude Code <imwhyyy.hyping@gmail.com>
Date: Sun, 13 Jul 2025 12:51:19 +0200
Subject: [PATCH] Add error handling to Discord Presence module
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Added try-catch blocks around Discord IPC calls to prevent crashes
- Added informative error messages when Discord is not running
- Module now automatically disables itself on connection failure
- Prevents spam of repeated error messages

This fixes issue #5535 where Discord presence would fail silently
when Discord is not running or connection fails.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../systems/modules/misc/DiscordPresence.java | 59 +++++++++++++------
 1 file changed, 41 insertions(+), 18 deletions(-)

diff --git a/src/main/java/meteordevelopment/meteorclient/systems/modules/misc/DiscordPresence.java b/src/main/java/meteordevelopment/meteorclient/systems/modules/misc/DiscordPresence.java
index 5a36774923..a637811838 100644
--- a/src/main/java/meteordevelopment/meteorclient/systems/modules/misc/DiscordPresence.java
+++ b/src/main/java/meteordevelopment/meteorclient/systems/modules/misc/DiscordPresence.java
@@ -107,6 +107,7 @@ public enum SelectMode {
     private SmallImage currentSmallImage;
     private int ticks;
     private boolean forceUpdate, lastWasInMainMenu;
+    private boolean hasLoggedError = false;
 
     private final List<Script> line1Scripts = new ArrayList<>();
     private int line1Ticks, line1I;
@@ -146,31 +147,42 @@ public static void unregisterCustomState(String packageName) {
 
     @Override
     public void onActivate() {
-        DiscordIPC.start(835240968533049424L, null);
+        try {
+            DiscordIPC.start(835240968533049424L, null);
 
-        rpc.setStart(System.currentTimeMillis() / 1000L);
+            rpc.setStart(System.currentTimeMillis() / 1000L);
 
-        String largeText = "%s %s".formatted(MeteorClient.NAME, MeteorClient.VERSION);
-        if (!MeteorClient.BUILD_NUMBER.isEmpty()) largeText += " Build: " + MeteorClient.BUILD_NUMBER;
-        rpc.setLargeImage("meteor_client", largeText);
+            String largeText = "%s %s".formatted(MeteorClient.NAME, MeteorClient.VERSION);
+            if (!MeteorClient.BUILD_NUMBER.isEmpty()) largeText += " Build: " + MeteorClient.BUILD_NUMBER;
+            rpc.setLargeImage("meteor_client", largeText);
 
-        currentSmallImage = SmallImage.Snail;
+            currentSmallImage = SmallImage.Snail;
 
-        recompileLine1();
-        recompileLine2();
+            recompileLine1();
+            recompileLine2();
 
-        ticks = 0;
-        line1Ticks = 0;
-        line2Ticks = 0;
-        lastWasInMainMenu = false;
-
-        line1I = 0;
-        line2I = 0;
+            ticks = 0;
+            line1Ticks = 0;
+            line2Ticks = 0;
+            lastWasInMainMenu = false;
+            hasLoggedError = false;
+
+            line1I = 0;
+            line2I = 0;
+        } catch (Exception e) {
+            error("Failed to start Discord Rich Presence: " + e.getMessage());
+            error("Make sure Discord is running and try again.");
+            toggle();
+        }
     }
 
     @Override
     public void onDeactivate() {
-        DiscordIPC.stop();
+        try {
+            DiscordIPC.stop();
+        } catch (Exception e) {
+            // Ignore errors when stopping
+        }
     }
 
     private void recompile(List<String> messages, List<Script> scripts) {
@@ -277,7 +289,18 @@ private void onTick(TickEvent.Post event) {
         }
 
         // Update
-        if (update) DiscordIPC.setActivity(rpc);
+        if (update) {
+            try {
+                DiscordIPC.setActivity(rpc);
+            } catch (Exception e) {
+                if (!hasLoggedError) {
+                    error("Failed to update Discord Rich Presence: " + e.getMessage());
+                    error("Make sure Discord is running. Module will be disabled.");
+                    hasLoggedError = true;
+                }
+                toggle();
+            }
+        }
         forceUpdate = false;
         lastWasInMainMenu = !Utils.canUpdate();
     }
@@ -315,4 +338,4 @@ SmallImage next() {
             return MineGame;
         }
     }
-}
+}
\ No newline at end of file