From 08b7d75e5c6e030453ece4a3c19c5e905b05bb10 Mon Sep 17 00:00:00 2001 From: PKLite Date: Thu, 12 Sep 2019 03:56:17 -0400 Subject: [PATCH] fix checkstyle and npe Signed-off-by: PKLite (cherry picked from commit 4596af4a2ca227cf734edfb7b6388466ee1fe8ff) --- .../plugins/playerindicators/PlayerIndicatorsOverlay.java | 1 - .../plugins/playerindicators/PlayerIndicatorsService.java | 2 +- 2 files changed, 1 insertion(+), 2 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 540ad4b14b..040e37b14f 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 @@ -28,7 +28,6 @@ package net.runelite.client.plugins.playerindicators; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Polygon; import java.awt.image.BufferedImage; import java.util.Arrays; import java.util.List; 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 cf79ddc9e2..4e1e6a866f 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 @@ -62,7 +62,7 @@ public class PlayerIndicatorsService && client.isFriended(player.getName(), false) && plugin.getLocationHashMap().containsKey(PlayerRelation.FRIEND)); - clan = (player) -> (player.isClanMember() && !client.isFriended(player.getName(), false) + clan = (player) -> (player.isClanMember() && !client.getLocalPlayer().equals(player) && !client.isFriended(player.getName(), false) && plugin.getLocationHashMap().containsKey(PlayerRelation.CLAN)); team = (player) -> (Objects.requireNonNull(client.getLocalPlayer()).getTeam() != 0 && !player.isClanMember()