From 8932ef4f745de3ecdfa76cf7c4e028bf0c514705 Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Sun, 15 Apr 2018 11:35:39 -0400
Subject: [PATCH] Use built in player index field

---
 .../main/java/net/runelite/api/Player.java    |  2 --
 .../net/runelite/mixins/RSClientMixin.java    | 19 +------------------
 .../net/runelite/mixins/RSPlayerMixin.java    | 14 --------------
 .../java/net/runelite/rs/api/RSPlayer.java    |  8 +++-----
 4 files changed, 4 insertions(+), 39 deletions(-)

diff --git a/runelite-api/src/main/java/net/runelite/api/Player.java b/runelite-api/src/main/java/net/runelite/api/Player.java
index 26943e4a08..6ea285b3d1 100644
--- a/runelite-api/src/main/java/net/runelite/api/Player.java
+++ b/runelite-api/src/main/java/net/runelite/api/Player.java
@@ -40,6 +40,4 @@ public interface Player extends Actor
 	boolean isClanMember();
 
 	boolean isFriend();
-
-	int getIndex();
 }
diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
index 36ce3d53a7..b10268ebf9 100644
--- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
+++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
@@ -672,23 +672,6 @@ public abstract class RSClientMixin implements RSClient
 		}
 	}
 
-	@FieldHook("cachedPlayers")
-	@Inject
-	public static void cachedPlayersChanged(int idx)
-	{
-		RSPlayer[] cachedPlayers = client.getCachedPlayers();
-		if (idx < 0 || idx >= cachedPlayers.length)
-		{
-			return;
-		}
-
-		RSPlayer player = cachedPlayers[idx];
-		if (player != null)
-		{
-			player.setIndex(idx);
-		}
-	}
-
 	@Inject
 	@FieldHook("grandExchangeOffers")
 	public static void onGrandExchangeOffersChanged(int idx)
@@ -777,7 +760,7 @@ public abstract class RSClientMixin implements RSClient
 	public void setHintArrow(Player player)
 	{
 		client.setHintArrowTargetType(HintArrowType.PLAYER.getValue());
-		client.setHintArrowPlayerTargetIdx(player.getIndex());
+		client.setHintArrowPlayerTargetIdx(((RSPlayer) player).getPlayerId());
 	}
 
 	@Inject
diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java
index 020be2b8cc..23b142f784 100644
--- a/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java
+++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java
@@ -148,20 +148,6 @@ public abstract class RSPlayerMixin implements RSPlayer
 		return rotatedTriangles;
 	}
 
-	@Inject
-	@Override
-	public int getIndex()
-	{
-		return playerIndex;
-	}
-
-	@Inject
-	@Override
-	public void setIndex(int index)
-	{
-		this.playerIndex = index;
-	}
-
 	@Copy("getModel")
 	public abstract RSModel rs$getModel();
 
diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSPlayer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSPlayer.java
index 8e8d5a9d9f..1e693a0e94 100644
--- a/runescape-api/src/main/java/net/runelite/rs/api/RSPlayer.java
+++ b/runescape-api/src/main/java/net/runelite/rs/api/RSPlayer.java
@@ -32,6 +32,9 @@ public interface RSPlayer extends RSActor, Player
 	@Import("name")
 	RSName getRsName();
 
+	@Import("playerId")
+	int getPlayerId();
+
 	@Import("composition")
 	@Override
 	RSPlayerComposition getPlayerComposition();
@@ -54,9 +57,4 @@ public interface RSPlayer extends RSActor, Player
 	@Import("isFriend")
 	@Override
 	boolean isFriend();
-
-	@Override
-	int getIndex();
-
-	void setIndex(int id);
 }