Use built in player index field
This commit is contained in:
@@ -40,6 +40,4 @@ public interface Player extends Actor
|
|||||||
boolean isClanMember();
|
boolean isClanMember();
|
||||||
|
|
||||||
boolean isFriend();
|
boolean isFriend();
|
||||||
|
|
||||||
int getIndex();
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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
|
@Inject
|
||||||
@FieldHook("grandExchangeOffers")
|
@FieldHook("grandExchangeOffers")
|
||||||
public static void onGrandExchangeOffersChanged(int idx)
|
public static void onGrandExchangeOffersChanged(int idx)
|
||||||
@@ -777,7 +760,7 @@ public abstract class RSClientMixin implements RSClient
|
|||||||
public void setHintArrow(Player player)
|
public void setHintArrow(Player player)
|
||||||
{
|
{
|
||||||
client.setHintArrowTargetType(HintArrowType.PLAYER.getValue());
|
client.setHintArrowTargetType(HintArrowType.PLAYER.getValue());
|
||||||
client.setHintArrowPlayerTargetIdx(player.getIndex());
|
client.setHintArrowPlayerTargetIdx(((RSPlayer) player).getPlayerId());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
|
|||||||
@@ -148,20 +148,6 @@ public abstract class RSPlayerMixin implements RSPlayer
|
|||||||
return rotatedTriangles;
|
return rotatedTriangles;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Inject
|
|
||||||
@Override
|
|
||||||
public int getIndex()
|
|
||||||
{
|
|
||||||
return playerIndex;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
@Override
|
|
||||||
public void setIndex(int index)
|
|
||||||
{
|
|
||||||
this.playerIndex = index;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Copy("getModel")
|
@Copy("getModel")
|
||||||
public abstract RSModel rs$getModel();
|
public abstract RSModel rs$getModel();
|
||||||
|
|
||||||
|
|||||||
@@ -32,6 +32,9 @@ public interface RSPlayer extends RSActor, Player
|
|||||||
@Import("name")
|
@Import("name")
|
||||||
RSName getRsName();
|
RSName getRsName();
|
||||||
|
|
||||||
|
@Import("playerId")
|
||||||
|
int getPlayerId();
|
||||||
|
|
||||||
@Import("composition")
|
@Import("composition")
|
||||||
@Override
|
@Override
|
||||||
RSPlayerComposition getPlayerComposition();
|
RSPlayerComposition getPlayerComposition();
|
||||||
@@ -54,9 +57,4 @@ public interface RSPlayer extends RSActor, Player
|
|||||||
@Import("isFriend")
|
@Import("isFriend")
|
||||||
@Override
|
@Override
|
||||||
boolean isFriend();
|
boolean isFriend();
|
||||||
|
|
||||||
@Override
|
|
||||||
int getIndex();
|
|
||||||
|
|
||||||
void setIndex(int id);
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user