From 6c85d64fe91f6da20ff1b12b2776b42d486e156c Mon Sep 17 00:00:00 2001
From: sdburns1998 <sdburn1998@gmail.com>
Date: Mon, 8 Jul 2019 18:07:09 +0200
Subject: [PATCH] api: Simplify if statements

---
 .../src/main/java/net/runelite/api/Point.java    |  6 +-----
 .../java/net/runelite/api/coords/WorldArea.java  |  7 ++-----
 .../java/net/runelite/api/coords/WorldPoint.java | 16 ++++++----------
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/runelite-api/src/main/java/net/runelite/api/Point.java b/runelite-api/src/main/java/net/runelite/api/Point.java
index 1c97a43666..a4aa342983 100644
--- a/runelite-api/src/main/java/net/runelite/api/Point.java
+++ b/runelite-api/src/main/java/net/runelite/api/Point.java
@@ -104,10 +104,6 @@ public class Point
 		{
 			return false;
 		}
-		if (this.y != other.y)
-		{
-			return false;
-		}
-		return true;
+		return this.y == other.y;
 	}
 }
diff --git a/runelite-api/src/main/java/net/runelite/api/coords/WorldArea.java b/runelite-api/src/main/java/net/runelite/api/coords/WorldArea.java
index 7156045eb8..0b39214143 100644
--- a/runelite-api/src/main/java/net/runelite/api/coords/WorldArea.java
+++ b/runelite-api/src/main/java/net/runelite/api/coords/WorldArea.java
@@ -427,11 +427,8 @@ public class WorldArea
 			}
 			if (height == 1)
 			{
-				if ((collisionDataFlags[checkX - dx][checkY] & yFlags) != 0 &&
-					extraCondition.test(WorldPoint.fromScene(client, startX, checkY, client.getPlane())))
-				{
-					return false;
-				}
+				return (collisionDataFlags[checkX - dx][checkY] & yFlags) == 0 ||
+					!extraCondition.test(WorldPoint.fromScene(client, startX, checkY, client.getPlane()));
 			}
 		}
 
diff --git a/runelite-api/src/main/java/net/runelite/api/coords/WorldPoint.java b/runelite-api/src/main/java/net/runelite/api/coords/WorldPoint.java
index fb1291273a..2882367c36 100644
--- a/runelite-api/src/main/java/net/runelite/api/coords/WorldPoint.java
+++ b/runelite-api/src/main/java/net/runelite/api/coords/WorldPoint.java
@@ -370,16 +370,12 @@ public class WorldPoint
 	 */
 	public static boolean isInZone(WorldPoint lowerBound, WorldPoint upperBound, WorldPoint userLocation)
 	{
-		if (userLocation.getX() < lowerBound.getX()
-				|| userLocation.getX() > upperBound.getX()
-				|| userLocation.getY() < lowerBound.getY()
-				|| userLocation.getY() > upperBound.getY()
-				|| userLocation.getPlane() < lowerBound.getPlane()
-				|| userLocation.getPlane() > upperBound.getPlane())
-		{
-			return false;
-		}
-		return true;
+		return userLocation.getX() >= lowerBound.getX()
+			&& userLocation.getX() <= upperBound.getX()
+			&& userLocation.getY() >= lowerBound.getY()
+			&& userLocation.getY() <= upperBound.getY()
+			&& userLocation.getPlane() >= lowerBound.getPlane()
+			&& userLocation.getPlane() <= upperBound.getPlane();
 	}
 
 	/**