From 0821cf216d43265188f4408be29e64f83bc6c286 Mon Sep 17 00:00:00 2001
From: Adam <Adam@sigterm.info>
Date: Sun, 24 Feb 2019 20:18:31 -0500
Subject: [PATCH] Clear stored npcs in fishing/pc/rc plugins

Fixes #5970

This was originally attempted in 7eeb484c648c95f84505b039fd33ad18bf9c55d6 but
NPCs are not automatically despawned from a scene change, which causes eg. the
fishing plugin to lose fishing spots that are in view during a scene change.
---
 .../client/plugins/fishing/FishingPlugin.java      | 12 ++++++++++++
 .../plugins/pestcontrol/PestControlPlugin.java     | 14 +++++++++++++-
 .../client/plugins/runecraft/RunecraftPlugin.java  | 12 ++++++++++--
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java
index 592f706455..8da48d7cdc 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java
@@ -50,6 +50,7 @@ import net.runelite.api.NPC;
 import net.runelite.api.Varbits;
 import net.runelite.api.coords.LocalPoint;
 import net.runelite.api.events.ChatMessage;
+import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.InteractingChanged;
 import net.runelite.api.events.ItemContainerChanged;
@@ -143,6 +144,17 @@ public class FishingPlugin extends Plugin
 		currentSpot = null;
 	}
 
+	@Subscribe
+	public void onGameStateChanged(GameStateChanged gameStateChanged)
+	{
+		GameState gameState = gameStateChanged.getGameState();
+		if (gameState == GameState.CONNECTION_LOST || gameState == GameState.LOGIN_SCREEN || gameState == GameState.HOPPING)
+		{
+			fishingSpots.clear();
+			minnowSpots.clear();
+		}
+	}
+
 	@Subscribe
 	public void onItemContainerChanged(ItemContainerChanged event)
 	{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlPlugin.java
index 7407c5f301..7e711e66a0 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlPlugin.java
@@ -35,12 +35,14 @@ import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.Client;
+import net.runelite.api.GameState;
 import net.runelite.api.NPC;
 import net.runelite.api.NpcID;
 import net.runelite.api.events.ChatMessage;
-import net.runelite.client.eventbus.Subscribe;
+import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.NpcDespawned;
 import net.runelite.api.events.NpcSpawned;
+import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
 import net.runelite.client.ui.overlay.OverlayManager;
@@ -87,6 +89,16 @@ public class PestControlPlugin extends Plugin
 		spinners.clear();
 	}
 
+	@Subscribe
+	public void onGameStateChanged(GameStateChanged event)
+	{
+		GameState gameState = event.getGameState();
+		if (gameState == GameState.CONNECTION_LOST || gameState == GameState.LOGIN_SCREEN || gameState == GameState.HOPPING)
+		{
+			spinners.clear();
+		}
+	}
+
 	@Subscribe
 	public void onChatMessage(ChatMessage chatMessage)
 	{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java
index 7f0cef2d94..4662b95d5a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java
@@ -229,9 +229,17 @@ public class RunecraftPlugin extends Plugin
 	@Subscribe
 	public void onGameStateChanged(GameStateChanged event)
 	{
-		if (event.getGameState() == GameState.LOADING)
+		GameState gameState = event.getGameState();
+		switch (gameState)
 		{
-			abyssObjects.clear();
+			case LOADING:
+				abyssObjects.clear();
+				break;
+			case CONNECTION_LOST:
+			case HOPPING:
+			case LOGIN_SCREEN:
+				darkMage = null;
+				break;
 		}
 	}