From d5c5ae8dcfb66b7ddd9f9392b569c45a22ced2a8 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Sun, 4 Feb 2018 17:57:28 +0100 Subject: [PATCH] Add startup and shutdown methods to DiscordPlugin Add startup and shutdown methods that will update/reset the current discord rich presence status Signed-off-by: Tomas Slusny --- .../client/plugins/discord/DiscordPlugin.java | 13 +++++++++++++ .../client/plugins/discord/DiscordState.java | 10 ++++++++++ 2 files changed, 23 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java index db8ab0f106..18dedd0c20 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java @@ -65,6 +65,19 @@ public class DiscordPlugin extends Plugin return configManager.getConfig(DiscordConfig.class); } + @Override + protected void startUp() throws Exception + { + updateGameStatus(client.getGameState(), true); + } + + @Override + protected void shutDown() throws Exception + { + discordService.clearPresence(); + discordState.reset(); + } + @Subscribe public void onGameStateChanged(GameStateChanged event) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordState.java b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordState.java index 630b2c4097..a6365bed66 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordState.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordState.java @@ -41,6 +41,16 @@ public class DiscordState private DiscordPresence lastPresence; private boolean needsFlush; + void reset() + { + lastQueue.clear(); + lastEvent = null; + startOfAction = null; + lastAction = null; + lastPresence = null; + needsFlush = false; + } + void flushEvent(DiscordService discordService) { if (lastPresence != null && needsFlush)