Clear stored npcs in fishing/pc/rc plugins

Fixes #5970
This commit is contained in:
Adam
2019-02-03 20:31:32 -05:00
parent 9759137dfe
commit 7eeb484c64
3 changed files with 24 additions and 1 deletions

View File

@@ -50,6 +50,7 @@ import net.runelite.api.NPC;
import net.runelite.api.Varbits; import net.runelite.api.Varbits;
import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.LocalPoint;
import net.runelite.api.events.ChatMessage; import net.runelite.api.events.ChatMessage;
import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.GameTick; import net.runelite.api.events.GameTick;
import net.runelite.api.events.InteractingChanged; import net.runelite.api.events.InteractingChanged;
import net.runelite.api.events.ItemContainerChanged; import net.runelite.api.events.ItemContainerChanged;
@@ -143,6 +144,16 @@ public class FishingPlugin extends Plugin
currentSpot = null; currentSpot = null;
} }
@Subscribe
public void onGameStateChanged(GameStateChanged gameStateChanged)
{
if (gameStateChanged.getGameState() == GameState.LOADING)
{
fishingSpots.clear();
minnowSpots.clear();
}
}
@Subscribe @Subscribe
public void onItemContainerChanged(ItemContainerChanged event) public void onItemContainerChanged(ItemContainerChanged event)
{ {

View File

@@ -35,12 +35,14 @@ import lombok.AccessLevel;
import lombok.Getter; import lombok.Getter;
import net.runelite.api.ChatMessageType; import net.runelite.api.ChatMessageType;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.GameState;
import net.runelite.api.NPC; import net.runelite.api.NPC;
import net.runelite.api.NpcID; import net.runelite.api.NpcID;
import net.runelite.api.events.ChatMessage; 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.NpcDespawned;
import net.runelite.api.events.NpcSpawned; import net.runelite.api.events.NpcSpawned;
import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.ui.overlay.OverlayManager; import net.runelite.client.ui.overlay.OverlayManager;
@@ -87,6 +89,15 @@ public class PestControlPlugin extends Plugin
spinners.clear(); spinners.clear();
} }
@Subscribe
public void onGameStateChanged(GameStateChanged event)
{
if (event.getGameState() == GameState.LOADING)
{
spinners.clear();
}
}
@Subscribe @Subscribe
public void onChatMessage(ChatMessage chatMessage) public void onChatMessage(ChatMessage chatMessage)
{ {

View File

@@ -232,6 +232,7 @@ public class RunecraftPlugin extends Plugin
if (event.getGameState() == GameState.LOADING) if (event.getGameState() == GameState.LOADING)
{ {
abyssObjects.clear(); abyssObjects.clear();
darkMage = null;
} }
} }