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

tobdamagecount: Merge nested if statements

Browse Source
This commit is contained in:
sdburns1998
2019-07-07 21:49:54 +02:00
parent fb9bcd09c5
commit f06ae013de
1 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java
View File

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