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

fix double rendering and a priority issue

Browse Source 
Signed-off-by: PKLite <stonewall@pklite.xyz>
(cherry picked from commit 1724ad8a468af5bb678030ed77d1485996d72ebb)
This commit is contained in:
PKLite
2019-09-09 08:27:18 -04:00
parent 8a43f10599
commit 98bb51dc09
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsOverlay.java
View File

@@ -124,7 +124,8 @@ public class PlayerIndicatorsOverlay extends Overlay
{ {
OverlayUtil.renderActorTextAndImage(graphics, actor, builtString, color, OverlayUtil.renderActorTextAndImage(graphics, actor, builtString, color,
ImageUtil.resizeImage(skullIcon, y, y), 0, x); ImageUtil.resizeImage(skullIcon, y, y), ACTOR_OVERHEAD_TEXT_MARGIN, ACTOR_HORIZONTAL_TEXT_MARGIN);
return;
} }
if (plugin.isHighlightClan() && actor.isClanMember() && plugin.isShowClanRanks() && relation == PlayerRelation.CLAN) if (plugin.isHighlightClan() && actor.isClanMember() && plugin.isShowClanRanks() && relation == PlayerRelation.CLAN)
{ {

7
runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java
View File

@@ -71,15 +71,16 @@ public class PlayerIndicatorsService
&& plugin.getLocationHashMap().containsKey(PlayerRelation.TEAM)); && plugin.getLocationHashMap().containsKey(PlayerRelation.TEAM));
target = (player) -> (!team.test(player) && !clan.test(player) target = (player) -> (!team.test(player) && !clan.test(player)
&& !friend.test(player) && PvPUtil.isAttackable(client, player) && !client.isFriended(player.getName(), false) && PvPUtil.isAttackable(client, player)
&& !self.test(player) && plugin.getLocationHashMap().containsKey(PlayerRelation.TARGET)); && !client.getLocalPlayer().equals(player) && plugin.getLocationHashMap().containsKey(PlayerRelation.TARGET));
caller = (player) -> (plugin.isCaller(player) && plugin.getLocationHashMap().containsKey(PlayerRelation.CALLER)); caller = (player) -> (plugin.isCaller(player) && plugin.getLocationHashMap().containsKey(PlayerRelation.CALLER));
callerTarget = (player) -> (plugin.isPile(player) && plugin.getLocationHashMap().containsKey(PlayerRelation.CALLER_TARGET)); callerTarget = (player) -> (plugin.isPile(player) && plugin.getLocationHashMap().containsKey(PlayerRelation.CALLER_TARGET));
other = (player) -> other = (player) ->
(!PvPUtil.isAttackable(client, player) && !team.test(player) && !clan.test(player) && !friend.test(player) (!PvPUtil.isAttackable(client, player) && !client.getLocalPlayer().equals(player)
&& !team.test(player) && !player.isClanMember() && !client.isFriended(player.getName(), false)
&& plugin.getLocationHashMap().containsKey(PlayerRelation.OTHER)); && plugin.getLocationHashMap().containsKey(PlayerRelation.OTHER));
} }