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

mixin: match upstream player getId

Browse Source
This commit is contained in:
Justin
2022-05-26 21:44:01 +10:00
parent 6fd1cfbdaf
commit e37a7e1a66
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1128,7 +1128,7 @@ public abstract class RSClientMixin implements RSClient
} }
else if (target instanceof Player) else if (target instanceof Player)
{ {
targetIndex = -(((Player) target).getPlayerId() + 1); targetIndex = -(((Player) target).getId() + 1);
} }
RSProjectile projectile = client.newProjectile(id, plane, startX, startY, startZ, startCycle, endCycle, slope, startHeight, targetIndex, endHeight); RSProjectile projectile = client.newProjectile(id, plane, startX, startY, startZ, startCycle, endCycle, slope, startHeight, targetIndex, endHeight);
@@ -1571,7 +1571,7 @@ public abstract class RSClientMixin implements RSClient
final Player p = client.getHintArrowPlayer(); final Player p = client.getHintArrowPlayer();
if (p != null) if (p != null)
{ {
client.setLocalInteractingIndex(p.getPlayerId() & 2047); client.setLocalInteractingIndex(p.getId() & 2047);
} }
} }
} }
@@ -1626,7 +1626,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(((RSPlayer) player).getPlayerId()); client.setHintArrowPlayerTargetIdx(((RSPlayer) player).getId());
hintPlayerChanged(-1); hintPlayerChanged(-1);
} }

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

@@ -32,6 +32,10 @@ public interface RSPlayer extends RSActor, Player
@Import("username") @Import("username")
RSUsername getRsName(); RSUsername getRsName();
@Import("index")
int getId();
@Deprecated(forRemoval = true, since = "4.28.0")
@Import("index") @Import("index")
int getPlayerId(); int getPlayerId();