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

clanmanmode: Combine nested if statements

Browse Source
This commit is contained in:
sdburns1998
2019-07-07 03:01:22 +02:00
parent aa353c33a9
commit f691e28742
1 changed files with 52 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java
View File

@@ -37,12 +37,7 @@ public class ClanManModeService
int selfmax = localPlayer.getCombatLevel() + plugin.wildernessLevel; int selfmax = localPlayer.getCombatLevel() + plugin.wildernessLevel;
for (Player player : client.getPlayers()) for (Player player : client.getPlayers())
{ {
if (player == null || player.getName() == null) if (player == null || player.getName() == null || player.equals(localPlayer))
{
continue;
}
if (player.equals(localPlayer))
{ {
continue; continue;
} }
@@ -55,16 +50,10 @@ public class ClanManModeService
interactor = ((Player) interacting); interactor = ((Player) interacting);
} }
if (plugin.isShowAttackers()) if (plugin.isShowAttackers() && interactor != null && interactor.getName().equals(localName))
{
if (interactor != null)
{
if (interactor.getName().equals(localName))
{ {
consumer.accept(player, plugin.getGetAttackerColor()); consumer.accept(player, plugin.getGetAttackerColor());
} }
}
}
if (plugin.inwildy == 1) if (plugin.inwildy == 1)
{ {
@@ -74,11 +63,7 @@ public class ClanManModeService
{ {
plugin.clan.put(player.getName(), player.getCombatLevel()); plugin.clan.put(player.getName(), player.getCombatLevel());
} }
if (plugin.isHighlightAttacked()) if (plugin.isHighlightAttacked() && interactor != null && !interactors.containsKey(interactor.getName()))
{
if (interactor != null)
{
if (!interactors.containsKey(interactor.getName()))
{ {
WorldPoint a = interactor.getWorldLocation(); WorldPoint a = interactor.getWorldLocation();
int underLevel = ((a.getY() - 9920) / 8) + 1; int underLevel = ((a.getY() - 9920) / 8) + 1;
@@ -107,20 +92,13 @@ public class ClanManModeService
} }
} }
} }
}
}
else else
{ {
if (plugin.isPersistentClan()) if (plugin.isPersistentClan() && plugin.clan.containsKey(player.getName()))
{
if (plugin.clan.containsKey(player.getName()))
{ {
consumer.accept(player, plugin.getGetClanMemberColor()); consumer.accept(player, plugin.getGetClanMemberColor());
} }
} if (plugin.isHighlightAttacked() && interactors.containsKey(player.getName()))
if (plugin.isHighlightAttacked())
{
if (interactors.containsKey(player.getName()))
{ {
String attackername = interactors.get(player.getName()); String attackername = interactors.get(player.getName());
boolean found = false; boolean found = false;
@@ -158,7 +136,6 @@ public class ClanManModeService
} }
continue; continue;
} }
}
if (plugin.isHighlightAttackable()) if (plugin.isHighlightAttackable())
{ {
if ((plugin.isHideAttackable() && plugin.ticks >= plugin.getHideTime()) || plugin.clan.containsKey(player.getName())) if ((plugin.isHideAttackable() && plugin.ticks >= plugin.getHideTime()) || plugin.clan.containsKey(player.getName()))