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

playerindicators: Clan indicators fix (#1796)

Browse Source 
* 2.1.8.0 version bump

* Fix's clan name double rendering bug

* fix bug where clan memebers can show up as targets
This commit is contained in:
ST0NEWALL
2019-10-17 07:10:39 -04:00
committed by Kyle
parent b130138bcd
commit cb81816763
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -131,14 +131,12 @@ public class PlayerIndicatorsOverlay extends Overlay
} }
} }
} }
else if (skulls && actor.getSkullIcon() != null && relation.equals(PlayerRelation.TARGET))
if (skulls && actor.getSkullIcon() != null && relation.equals(PlayerRelation.TARGET))
{ {
OverlayUtil.renderActorTextAndImage(graphics, actor, builtString, color, OverlayUtil.renderActorTextAndImage(graphics, actor, builtString, color,
ImageUtil.resizeImage(skullIcon, y, y), ACTOR_OVERHEAD_TEXT_MARGIN, ACTOR_HORIZONTAL_TEXT_MARGIN); ImageUtil.resizeImage(skullIcon, y, y), ACTOR_OVERHEAD_TEXT_MARGIN, ACTOR_HORIZONTAL_TEXT_MARGIN);
} }
else else
{ {
OverlayUtil.renderActorTextOverlay(graphics, actor, builtString, color); OverlayUtil.renderActorTextOverlay(graphics, actor, builtString, color);

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

@@ -72,7 +72,7 @@ public class PlayerIndicatorsService
target = (player) -> (!team.test(player) && !clan.test(player) target = (player) -> (!team.test(player) && !clan.test(player)
&& !client.isFriended(player.getName(), false) && PvPUtil.isAttackable(client, 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)); caller = (player) -> (plugin.isCaller(player) && plugin.getLocationHashMap().containsKey(PlayerRelation.CALLER));
@@ -80,7 +80,7 @@ public class PlayerIndicatorsService
other = (player) -> other = (player) ->
(!PvPUtil.isAttackable(client, player) && !client.getLocalPlayer().equals(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)); && plugin.getLocationHashMap().containsKey(PlayerRelation.OTHER));
} }