From 4243dce1b1b795af0bb697dc8c7da0b2f87f7066 Mon Sep 17 00:00:00 2001 From: Rangvaldr <47463740+rangvaldr@users.noreply.github.com> Date: Tue, 12 May 2020 15:11:03 -0400 Subject: [PATCH] discord: Update activity message while playing PVP or DMM (#11522) --- .../plugins/discord/DiscordGameEventType.java | 2 ++ .../client/plugins/discord/DiscordPlugin.java | 21 ++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java index 55d19919b7..26401c2bf5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java @@ -43,6 +43,8 @@ enum DiscordGameEventType IN_GAME("In Game", -3), IN_MENU("In Menu", -3), + PLAYING_DEADMAN("Playing Deadman Mode", -3), + PLAYING_PVP("Playing in a PVP world", -3), TRAINING_ATTACK(Skill.ATTACK), TRAINING_DEFENCE(Skill.DEFENCE), TRAINING_STRENGTH(Skill.STRENGTH), 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 0c17f75a26..017f229dae 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 @@ -381,6 +381,19 @@ public class DiscordPlugin extends Plugin return; } + final EnumSet worldType = client.getWorldType(); + + if (worldType.contains(WorldType.DEADMAN)) + { + discordState.triggerEvent(DiscordGameEventType.PLAYING_DEADMAN); + return; + } + else if (WorldType.isPvpWorld(worldType)) + { + discordState.triggerEvent(DiscordGameEventType.PLAYING_PVP); + return; + } + DiscordGameEventType discordGameEventType = DiscordGameEventType.fromRegion(playerRegionID); // NMZ uses the same region ID as KBD. KBD is always on plane 0 and NMZ is always above plane 0 @@ -413,14 +426,6 @@ public class DiscordPlugin extends Plugin return false; } - final EnumSet worldType = client.getWorldType(); - - // Do not show location in PVP activities - if (WorldType.isPvpWorld(worldType)) - { - return false; - } - switch (event.getDiscordAreaType()) { case BOSSES: return config.showBossActivity();