tobdamagecount: Merge nested if statements

This commit is contained in:
sdburns1998
2019-07-07 21:49:54 +02:00
parent fb9bcd09c5
commit f06ae013de

View File

@@ -126,11 +126,7 @@ public class DamageCounterPlugin extends Plugin
{
Player localPlayer = client.getLocalPlayer();
Actor interacting = localPlayer.getInteracting();
if (client.getGameState() == GameState.LOGGED_IN)
{
if (BossName == null)
{
if (interacting instanceof NPC)
if (client.getGameState() == GameState.LOGGED_IN && BossName == null && interacting instanceof NPC)
{
int interactingId = ((NPC) interacting).getId();
String interactingName = interacting.getName();
@@ -143,8 +139,6 @@ public class DamageCounterPlugin extends Plugin
}
}
}
}
}
@Subscribe
//if you hop it will reset the counter
@@ -186,9 +180,7 @@ public class DamageCounterPlugin extends Plugin
{
Player localPlayer = client.getLocalPlayer();
Actor interacting = localPlayer.getInteracting();
if (client.getGameState() == GameState.LOGGED_IN)
{
if (interacting instanceof NPC)
if (client.getGameState() == GameState.LOGGED_IN && interacting instanceof NPC)
{
String interactingName = interacting.getName();
if (interactingName.equals(BossName))
@@ -198,7 +190,6 @@ public class DamageCounterPlugin extends Plugin
}
}
}
}
@Subscribe