From 5a1a0e215bb10b3422c69f8a5b89bf75c26868c8 Mon Sep 17 00:00:00 2001
From: sdburns1998 <sdburn1998@gmail.com>
Date: Sun, 7 Jul 2019 04:12:49 +0200
Subject: [PATCH] flinchingplugin: Merge nested if statements

---
 .../plugins/flinching/FlinchingPlugin.java       | 16 +++++-----------
 .../plugins/flinching/FlinchingTarget.java       |  7 ++-----
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingPlugin.java
index 0ed62ecd06..0a93c00a23 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingPlugin.java
@@ -198,12 +198,9 @@ public class FlinchingPlugin extends Plugin
 				else
 				{
 					FlinchingTarget currentTarget = flinchingTargets.get(hitId);
-					if (currentTarget != null)
+					if (currentTarget != null && resetOnHit)
 					{
-						if (resetOnHit)
-						{
-							currentTarget.TargetHit();
-						}
+						currentTarget.TargetHit();
 					}
 				}
 			}
@@ -224,13 +221,10 @@ public class FlinchingPlugin extends Plugin
 			NPC newTarget = (NPC) interacting;
 			currentInteractingId = newTarget.getId();
 
-			if (newTarget.getHealth() <= 0 || newTarget.isDead())
+			if ((newTarget.getHealth() <= 0 || newTarget.isDead()) && flinchingTargets.containsKey(currentInteractingId))
 			{
-				if (flinchingTargets.containsKey(currentInteractingId))
-				{
-					flinchingTargets.remove(currentInteractingId);
-					currentInteractingId = -1;
-				}
+				flinchingTargets.remove(currentInteractingId);
+				currentInteractingId = -1;
 			}
 		}
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingTarget.java b/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingTarget.java
index 58d90cb247..f1d524dd4d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingTarget.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingTarget.java
@@ -63,12 +63,9 @@ public class FlinchingTarget
 	void TargetHit()
 	{
 		boolean shouldHit = true;
-		if (usingHitDelay)
+		if (usingHitDelay && GetRemainingTime() > displayLength)
 		{
-			if (GetRemainingTime() > displayLength)
-			{
-				shouldHit = false;
-			}
+			shouldHit = false;
 		}
 
 		if (shouldHit)