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

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

@@ -126,21 +126,15 @@ 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) int interactingId = ((NPC) interacting).getId();
String interactingName = interacting.getName();
for (int aNPCARRAY : NPCARRAY)
{ {
if (interacting instanceof NPC) if (aNPCARRAY == interactingId)
{ {
int interactingId = ((NPC) interacting).getId(); BossName = interactingName;
String interactingName = interacting.getName();
for (int aNPCARRAY : NPCARRAY)
{
if (aNPCARRAY == interactingId)
{
BossName = interactingName;
}
}
} }
} }
} }
@@ -186,16 +180,13 @@ 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();
if (interactingName.equals(BossName))
{ {
String interactingName = interacting.getName(); DamageCount += (XPtoDamage() * BOSS_MODIFIER);
if (interactingName.equals(BossName))
{
DamageCount += (XPtoDamage() * BOSS_MODIFIER);
}
} }
} }
} }