From 06db80841f813410689a9c1bdd9600eaf6e9e5bc Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 5 Dec 2023 13:04:54 -0500 Subject: [PATCH] raids: fix scouting on raid reload Reload sets party=-1 and then raid=0, so just reset if raid=0 happens when not in a party. --- .../runelite/client/plugins/raids/RaidsPlugin.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java index 4d7ce7a098f..791f43a9a0e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java @@ -264,10 +264,18 @@ public void onVarbitChanged(VarbitChanged event) if (event.getVarbitId() == Varbits.IN_RAID) { boolean inRaid = event.getValue() == 1; - // if the player is inside of a raid then check the raid - if (client.getGameState() == GameState.LOGGED_IN && inRaid) + if (client.getGameState() == GameState.LOGGED_IN) { - scoutRaid(); + // if the player is inside of a raid then check the raid + if (inRaid) + { + scoutRaid(); + } + else if (raidPartyID == -1) + { + log.debug("Raid has ended"); + reset(); + } } inRaidChambers = inRaid;