From f4f7df338e200d02ef90dc4ec19644c968b6be38 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 5 Sep 2018 16:45:19 +0000
Subject: [PATCH] Prevent L2Character next action NPE. Contributed by Sahar.

---
 .../java/com/l2jmobius/gameserver/model/actor/L2Character.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index 2d45cc3c24..9a984c1f06 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -5488,7 +5488,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 		}
 		
 		// Attack target after skill use
-		if ((skill.nextActionIsAttack()) && _target.isCharacter() && (_target != this) && (target != null) && (_target == target) && target.canBeAttacked())
+		if ((skill.nextActionIsAttack()) && (_target != this) && (target != null) && (_target == target) && _target.isCharacter() && target.canBeAttacked())
 		{
 			if ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO))
 			{