From cb81816763091ee7e3a584863454f187c3007630 Mon Sep 17 00:00:00 2001 From: ST0NEWALL <46624825+pklite@users.noreply.github.com> Date: Thu, 17 Oct 2019 07:10:39 -0400 Subject: [PATCH] playerindicators: Clan indicators fix (#1796) * 2.1.8.0 version bump * Fix's clan name double rendering bug * fix bug where clan memebers can show up as targets --- .../plugins/playerindicators/PlayerIndicatorsOverlay.java | 4 +--- .../plugins/playerindicators/PlayerIndicatorsService.java | 4 ++-- 2 files changed, 3 insertions(+), 5 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 a3ceee1087..86dae6756b 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 @@ -131,14 +131,12 @@ public class PlayerIndicatorsOverlay extends Overlay } } } - - if (skulls && actor.getSkullIcon() != null && relation.equals(PlayerRelation.TARGET)) + else if (skulls && actor.getSkullIcon() != null && relation.equals(PlayerRelation.TARGET)) { OverlayUtil.renderActorTextAndImage(graphics, actor, builtString, color, ImageUtil.resizeImage(skullIcon, y, y), ACTOR_OVERHEAD_TEXT_MARGIN, ACTOR_HORIZONTAL_TEXT_MARGIN); } - else { OverlayUtil.renderActorTextOverlay(graphics, actor, builtString, color); 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 432290946c..4ffa83cfb0 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 @@ -72,7 +72,7 @@ public class PlayerIndicatorsService target = (player) -> (!team.test(player) && !clan.test(player) && !client.isFriended(player.getName(), false) && PvPUtil.isAttackable(client, player) - && !client.getLocalPlayer().equals(player) && plugin.getLocationHashMap().containsKey(PlayerRelation.TARGET)); + && !client.getLocalPlayer().equals(player) && !clan.test(player) && plugin.getLocationHashMap().containsKey(PlayerRelation.TARGET)); caller = (player) -> (plugin.isCaller(player) && plugin.getLocationHashMap().containsKey(PlayerRelation.CALLER)); @@ -80,7 +80,7 @@ public class PlayerIndicatorsService other = (player) -> (!PvPUtil.isAttackable(client, player) && !client.getLocalPlayer().equals(player) - && !team.test(player) && !player.isClanMember() && !client.isFriended(player.getName(), false) + && !team.test(player) && !clan.test(player) && !client.isFriended(player.getName(), false) && plugin.getLocationHashMap().containsKey(PlayerRelation.OTHER)); }