ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #1566 from Adam-/player-index

Browse Source 
Use built in player index field
This commit is contained in:
Adam
2018-04-15 18:39:23 -04:00
committed by GitHub
parent e2d295e093 8932ef4f74
commit 21680650a7
4 changed files with 4 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-api/src/main/java/net/runelite/api/Player.java
View File

@@ -40,6 +40,4 @@ public interface Player extends Actor
boolean isClanMember();
boolean isFriend();
int getIndex();
}

19
runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
View File

@@ -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

14
runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java
View File

@@ -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();

8
runescape-api/src/main/java/net/runelite/rs/api/RSPlayer.java
View File

@@ -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);
}