From e12d0bd23bdda7ebb73b6f9686d1e7b0bee2c29e Mon Sep 17 00:00:00 2001
From: Adam <Adam@sigterm.info>
Date: Fri, 8 Nov 2019 10:34:20 -0500
Subject: [PATCH] speccounter: support fake xpdrops

---
 .../specialcounter/SpecialCounterPlugin.java  | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java
index 59330554c1..ad45a84565 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java
@@ -40,9 +40,11 @@ import net.runelite.api.NPCComposition;
 import net.runelite.api.Player;
 import net.runelite.api.Skill;
 import net.runelite.api.VarPlayer;
+import net.runelite.api.events.FakeXpDrop;
 import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.NpcDespawned;
+import net.runelite.api.events.StatChanged;
 import net.runelite.api.events.VarbitChanged;
 import net.runelite.client.callback.ClientThread;
 import net.runelite.client.eventbus.Subscribe;
@@ -65,6 +67,7 @@ public class SpecialCounterPlugin extends Plugin
 	private int currentWorld = -1;
 	private int specialPercentage = -1;
 	private int specialHitpointsExperience = -1;
+	private int specialHitpointsGained = -1;
 	private boolean specialUsed;
 	private double modifier = 1d;
 
@@ -138,6 +141,25 @@ public class SpecialCounterPlugin extends Plugin
 
 		specialUsed = true;
 		specialHitpointsExperience = client.getSkillExperience(Skill.HITPOINTS);
+		specialHitpointsGained = -1;
+	}
+
+	@Subscribe
+	public void onStatChanged(StatChanged statChanged)
+	{
+		if (specialUsed && statChanged.getSkill() == Skill.HITPOINTS)
+		{
+			specialHitpointsGained = statChanged.getXp() - specialHitpointsExperience;
+		}
+	}
+
+	@Subscribe
+	public void onFakeXpDrop(FakeXpDrop fakeXpDrop)
+	{
+		if (specialUsed && fakeXpDrop.getSkill() == Skill.HITPOINTS)
+		{
+			specialHitpointsGained = fakeXpDrop.getXp();
+		}
 	}
 
 	@Subscribe
@@ -149,13 +171,11 @@ public class SpecialCounterPlugin extends Plugin
 		}
 
 		int interactingId = checkInteracting();
-
-		if (interactingId > -1 && specialHitpointsExperience != -1 && specialUsed)
+		if (interactingId > -1 && specialUsed)
 		{
+			int deltaExperience = specialHitpointsGained;
+
 			specialUsed = false;
-			int hpXp = client.getSkillExperience(Skill.HITPOINTS);
-			int deltaExperience = hpXp - specialHitpointsExperience;
-			specialHitpointsExperience = -1;
 
 			if (deltaExperience > 0)
 			{