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

whalewatchers: Merge nested if statements

Browse Source
This commit is contained in:
sdburns1998
2019-07-07 21:54:17 +02:00
parent 9ed6759c83
commit 9764fac996
1 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java
View File

@@ -98,12 +98,9 @@ public class WhaleWatchersPlugin extends Plugin
@Subscribe @Subscribe
public void onOverlayMenuClicked(OverlayMenuClicked event) public void onOverlayMenuClicked(OverlayMenuClicked event)
{ {
if (event.getOverlay().equals(overlay)) if (event.getOverlay().equals(overlay) && event.getEntry().getOption().equals("Reset"))
{ {
if (event.getEntry().getOption().equals("Reset")) resetDamageCounter();
{
resetDamageCounter();
}
} }
} }
@@ -207,16 +204,10 @@ public class WhaleWatchersPlugin extends Plugin
@Subscribe @Subscribe
public void onVarbitChanged(VarbitChanged event) public void onVarbitChanged(VarbitChanged event)
{ {
if (this.showDamageCounter) if (this.showDamageCounter && client.getVar(VarPlayer.ATTACKING_PLAYER) == -1 && inCombat)
{
if (client.getVar(VarPlayer.ATTACKING_PLAYER) == -1)
{ {
if (inCombat) tickCountdown = 10;
{
tickCountdown = 10;
}
} }
}
if (this.protectItemWarning) if (this.protectItemWarning)
{ {
@@ -254,17 +245,14 @@ public class WhaleWatchersPlugin extends Plugin
@Subscribe @Subscribe
public void onGameTick(GameTick event) public void onGameTick(GameTick event)
{ {
if (this.showDamageCounter) if (this.showDamageCounter && tickCountdown > 0 && tickCountdown < 11)
{ {
if (tickCountdown > 0 && tickCountdown < 11) tickCountdown--;
if (tickCountdown == 1)
{ {
tickCountdown--; inCombat = false;
if (tickCountdown == 1) resetDamageCounter();
{ return;
inCombat = false;
resetDamageCounter();
return;
}
} }
} }
if (this.smiteableWarning && (client.getVar(Varbits.IN_WILDERNESS) == 1 || isPvpWorld(client.getWorldType()))) if (this.smiteableWarning && (client.getVar(Varbits.IN_WILDERNESS) == 1 || isPvpWorld(client.getWorldType())))