From f9623eee287424a3504b7d4b959ba359d5d46f4e Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 19 May 2018 12:50:38 +0000
Subject: [PATCH] AreaFriendly target handler NPE fix. Contributed by Sahar.

---
 .../data/scripts/handlers/targethandlers/AreaFriendly.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/targethandlers/AreaFriendly.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/targethandlers/AreaFriendly.java
index 0b800f7d35..5caf05d53b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/targethandlers/AreaFriendly.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/targethandlers/AreaFriendly.java
@@ -94,12 +94,12 @@ public class AreaFriendly implements ITargetTypeHandler
 	
 	private boolean checkTarget(L2PcInstance activeChar, L2Character target)
 	{
-		if (!GeoEngine.getInstance().canSeeTarget(activeChar, target))
+		if ((target == null) || target.isAlikeDead() || target.isDoor() || (target instanceof L2SiegeFlagInstance) || target.isMonster())
 		{
 			return false;
 		}
 		
-		if ((target == null) || target.isAlikeDead() || target.isDoor() || (target instanceof L2SiegeFlagInstance) || target.isMonster())
+		if (!GeoEngine.getInstance().canSeeTarget(activeChar, target))
 		{
 			return false;
 		}