From 09437f5b4e8335b3eaf30d98673a454a091c4426 Mon Sep 17 00:00:00 2001 From: Daniel Ginovker Date: Tue, 17 Nov 2020 21:37:08 -0500 Subject: [PATCH] Trycatch Discord Activity (#424) --- .../integrations/discord/DiscordActivity.java | 34 +++++++++++++------ 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/2006Redone Server/src/main/java/com/rebotted/integrations/discord/DiscordActivity.java b/2006Redone Server/src/main/java/com/rebotted/integrations/discord/DiscordActivity.java index af11dff2..6eab0571 100644 --- a/2006Redone Server/src/main/java/com/rebotted/integrations/discord/DiscordActivity.java +++ b/2006Redone Server/src/main/java/com/rebotted/integrations/discord/DiscordActivity.java @@ -7,19 +7,31 @@ public class DiscordActivity { private static int count = 50; public static void updateActivity() { - if (JavaCord.token != null && !JavaCord.token.equals("")) { - if (count == 0) { - if (PlayerHandler.getPlayerCount() != 1) { - JavaCord.api.updateActivity(PlayerHandler.getPlayerCount() + " Players Online"); - System.out.println("Discord Activity Updated"); - count = 100; + try { + if (JavaCord.token != null && !JavaCord.token.equals("")) { + if (count == 0) { + if (PlayerHandler.getPlayerCount() != 1) { + JavaCord.api.updateActivity(PlayerHandler.getPlayerCount() + " Players Online"); + System.out.println("Discord Activity Updated"); + count = 100; + } else { + JavaCord.api.updateActivity(PlayerHandler.getPlayerCount() + " Player Online"); + System.out.println("Discord Activity Updated"); + count = 100; + } } else { - JavaCord.api.updateActivity(PlayerHandler.getPlayerCount() + " Player Online"); - System.out.println("Discord Activity Updated"); - count = 100; + count--; } - } else { - count--; + } + + } catch (Exception e) { + System.out.println("Could not set Discord activity: " + e); + System.out.println("Null checks"); + try { + System.out.println("JavaCord.api: " + JavaCord.api); + System.out.println("PlayerHandler.getPlayerCount: " + PlayerHandler.getPlayerCount()); + } catch (Exception e2) { + System.out.println(e2); } } }