Merge remote-tracking branch 'upstream/master'

1 files changed, 20 insertions, 3 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
index a451088d..29e98038 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
@@ -7,6 +7,8 @@ import me.xmrvizzy.skyblocker.skyblock.dungeon.DungeonBlaze;
 import me.xmrvizzy.skyblocker.utils.Utils;
 import net.minecraft.client.MinecraftClient;
 
+import java.util.Objects;
+
 public class SkyblockerMod {
     public static final String NAMESPACE = "skyblocker";
     private static final SkyblockerMod instance = new SkyblockerMod();
@@ -36,7 +38,7 @@ public class SkyblockerMod {
             } catch (Exception e) {
                 //System.out.println("Blazesolver: " + e);
             }
-        if (ticks % 20 == 0) {
+        if (ticks % 20 == 0 ) {
             rpTimer++;
             if (rpTimer == 5){
                 discordRPCManager.updatePresence();
@@ -44,10 +46,25 @@ public class SkyblockerMod {
             }
             if (client.world != null && !client.isInSingleplayer())
                 Utils.sbChecker();
-            if (!discordRPCManager.isConnected && Utils.isSkyblock && SkyblockerConfig.get().general.richPresence.enableRichPresence && client.world != null && !client.isInSingleplayer()) discordRPCManager.start();
+            if (!discordRPCManager.isConnected && Utils.isSkyblock && SkyblockerConfig.get().general.richPresence.enableRichPresence && onHypxiel()) 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();
+            if (client.world == null || client.isInSingleplayer() || !Utils.isSkyblock || !onHypxiel()) if (discordRPCManager.isConnected)discordRPCManager.stop();
             ticks = 0;
         }
     }
+    public static MinecraftClient client() {
+        try {
+            return MinecraftClient.getInstance();
+        }
+        catch(NullPointerException e) {
+            return null;
+        }
+    }
+    public static boolean onHypxiel() {
+        try {
+            return client() != null && !client().isInSingleplayer() && client().getCurrentServerEntry().address != null && client().getCurrentServerEntry().address.contains("hypixel.net");
+        } catch (NullPointerException exception) {
+            return false;
+        }
+    }
 }
\ No newline at end of file