From 664ccf8a7c0acc114ab1be42fbab62bcbeaba7f0 Mon Sep 17 00:00:00 2001
From: inkoalawetrust <56005600+inkoalawetrust@users.noreply.github.com>
Date: Sat, 3 Sep 2022 19:04:58 -0400
Subject: [PATCH] - fix bug with
 https://github.com/ZDoom/gzdoom/commit/06ee21c51df2b2dd154c5e5e6a7ed8864dca84be
 - if (!pl) should always return false

---
 src/playsim/p_enemy.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/playsim/p_enemy.cpp b/src/playsim/p_enemy.cpp
index bb929f270..e4df53649 100644
--- a/src/playsim/p_enemy.cpp
+++ b/src/playsim/p_enemy.cpp
@@ -268,7 +268,10 @@ int P_CheckMeleeRange (AActor* actor, double range)
 	AActor *pl = actor->target;
 
 	double dist;
-		
+	
+	if (!pl)
+		return false;
+
 	dist = actor->Distance2D (pl);
 	if (range < 0) range = actor->meleerange;
 
@@ -279,7 +282,7 @@ int P_CheckMeleeRange (AActor* actor, double range)
 	if (pl == actor->goal)
 		return true;
 
-	if (!pl || (actor->Sector->Flags & SECF_NOATTACK))
+	if (actor->Sector->Flags & SECF_NOATTACK)
 		return false;
 
 	// [RH] Don't melee things too far above or below actor.