From 98bb51dc09d085bf62f8945462800d3052f0112c Mon Sep 17 00:00:00 2001 From: PKLite Date: Mon, 9 Sep 2019 08:27:18 -0400 Subject: [PATCH] fix double rendering and a priority issue Signed-off-by: PKLite (cherry picked from commit 1724ad8a468af5bb678030ed77d1485996d72ebb) --- .../plugins/playerindicators/PlayerIndicatorsOverlay.java | 3 ++- .../plugins/playerindicators/PlayerIndicatorsService.java | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsOverlay.java index 664b1f69d7..8f53af7282 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsOverlay.java @@ -124,7 +124,8 @@ public class PlayerIndicatorsOverlay extends Overlay { 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) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java index c9bbb08dbb..cf79ddc9e2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java @@ -71,15 +71,16 @@ public class PlayerIndicatorsService && plugin.getLocationHashMap().containsKey(PlayerRelation.TEAM)); target = (player) -> (!team.test(player) && !clan.test(player) - && !friend.test(player) && PvPUtil.isAttackable(client, player) - && !self.test(player) && plugin.getLocationHashMap().containsKey(PlayerRelation.TARGET)); + && !client.isFriended(player.getName(), false) && PvPUtil.isAttackable(client, player) + && !client.getLocalPlayer().equals(player) && plugin.getLocationHashMap().containsKey(PlayerRelation.TARGET)); caller = (player) -> (plugin.isCaller(player) && plugin.getLocationHashMap().containsKey(PlayerRelation.CALLER)); callerTarget = (player) -> (plugin.isPile(player) && plugin.getLocationHashMap().containsKey(PlayerRelation.CALLER_TARGET)); 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)); }