Merge pull request #2494 from ThatGamerBlue/oprs-boosts-info

boosts: fix statchanged event
open-osrs · Apr 9, 2020 · b0a6b38 · b0a6b38
2 parents 29d7ba2 + a001d1d
commit b0a6b38
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
@@ -1087,16 +1087,21 @@ public static void experiencedChanged(int idx)
 	@Inject
 	public static void boostedSkillLevelsChanged(int idx)
 	{
-		Skill[] skills = Skill.values();
+		if (idx == 0)
+		{
+			return;
+		}
 
-		if (idx >= 0 && idx < skills.length - 1)
+		int changedSkillIdx = idx - 1 & 31;
+		int skillIdx = client.getChangedSkillLevels()[changedSkillIdx];
+		Skill[] skills = Skill.values();
+		if (skillIdx >= 0 && skillIdx < skills.length - 1)
 		{
-			Skill updatedSkill = skills[idx];
 			StatChanged statChanged = new StatChanged(
-				updatedSkill,
-				client.getSkillExperience(updatedSkill),
-				client.getRealSkillLevel(updatedSkill),
-				client.getBoostedSkillLevel(updatedSkill)
+				skills[skillIdx],
+				client.getSkillExperiences()[skillIdx],
+				client.getRealSkillLevels()[skillIdx],
+				client.getBoostedSkillLevels()[skillIdx]
 			);
 			client.getCallbacks().post(StatChanged.class, statChanged);
 		}

diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java
@@ -1164,4 +1164,7 @@ public interface RSClient extends RSGameShell, Client
 
 	@Import("draggedWidgetY")
 	int getDraggedWidgetY();
+
+	@Import("changedSkills")
+	int[] getChangedSkillLevels();
 }