From bdeff5ee1059900e596ad7cbd193c78a4da1ce1e Mon Sep 17 00:00:00 2001
From: Adam <Adam@sigterm.info>
Date: Tue, 21 Aug 2018 08:05:23 -0400
Subject: [PATCH] corp plugin: fix losing track of corp when it spawns during
 loading

NPCs spawn in between loading and logged in. But since NPCs are not
cleared when loading, it is unnecessary to clear the corp on game state
change.
---
 .../java/net/runelite/client/plugins/corp/CorpPlugin.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java
index 5f2c43980c..6b5ceebd82 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java
@@ -31,6 +31,7 @@ import java.util.Set;
 import javax.inject.Inject;
 import lombok.AccessLevel;
 import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Actor;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.Client;
@@ -61,6 +62,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	description = "Show damage statistics and highlight dark energy cores",
 	tags = {"bosses", "combat", "pve", "overlay"}
 )
+@Slf4j
 public class CorpPlugin extends Plugin
 {
 	private static final int NPC_SECTION_ACTION = MenuAction.NPC_SECOND_OPTION.getId();
@@ -127,9 +129,8 @@ public class CorpPlugin extends Plugin
 	@Subscribe
 	public void onGameStateChanged(GameStateChanged gameStateChanged)
 	{
-		if (gameStateChanged.getGameState() == GameState.LOGGED_IN)
+		if (gameStateChanged.getGameState() == GameState.LOADING)
 		{
-			corp = core = null;
 			players.clear();
 		}
 	}
@@ -142,6 +143,7 @@ public class CorpPlugin extends Plugin
 		switch (npc.getId())
 		{
 			case NpcID.CORPOREAL_BEAST:
+				log.debug("Corporeal beast spawn: {}", npc);
 				corp = npc;
 				yourDamage = 0;
 				totalDamage = 0;
@@ -160,6 +162,7 @@ public class CorpPlugin extends Plugin
 
 		if (npc == corp)
 		{
+			log.debug("Corporeal beast despawn: {}", npc);
 			corp = null;
 			players.clear();