From ea14bb8c3ef950c9d27ab62f2344004fa030a8e3 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 7 Sep 2017 02:58:22 +0000
Subject: [PATCH] Fixed siege door targeting with enabled geodata.

---
 .../l2jmobius/gameserver/model/actor/L2Character.java  | 10 ++++------
 .../l2jmobius/gameserver/model/actor/L2Character.java  | 10 ++++------
 .../l2jmobius/gameserver/model/actor/L2Character.java  | 10 ++++------
 .../l2jmobius/gameserver/model/actor/L2Character.java  | 10 ++++------
 .../l2jmobius/gameserver/model/actor/L2Character.java  | 10 ++++------
 5 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index ee7f16229b..ece9ae1c59 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -1051,15 +1051,13 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 			// GeoData Los Check here (or dz > 1000)
 			if (!GeoEngine.getInstance().canSeeTarget(this, target))
 			{
-				if (target.isDoor() && target.isAutoAttackable(this))
+				if (!target.isDoor() || !target.isAutoAttackable(this))
 				{
-					getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, target.getLocation());
+					sendPacket(SystemMessageId.CANNOT_SEE_TARGET);
+					getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+					sendPacket(ActionFailed.STATIC_PACKET);
 					return;
 				}
-				sendPacket(SystemMessageId.CANNOT_SEE_TARGET);
-				getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
-				sendPacket(ActionFailed.STATIC_PACKET);
-				return;
 			}
 			
 			// BOW and CROSSBOW checks
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index ee7f16229b..ece9ae1c59 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -1051,15 +1051,13 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 			// GeoData Los Check here (or dz > 1000)
 			if (!GeoEngine.getInstance().canSeeTarget(this, target))
 			{
-				if (target.isDoor() && target.isAutoAttackable(this))
+				if (!target.isDoor() || !target.isAutoAttackable(this))
 				{
-					getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, target.getLocation());
+					sendPacket(SystemMessageId.CANNOT_SEE_TARGET);
+					getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+					sendPacket(ActionFailed.STATIC_PACKET);
 					return;
 				}
-				sendPacket(SystemMessageId.CANNOT_SEE_TARGET);
-				getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
-				sendPacket(ActionFailed.STATIC_PACKET);
-				return;
 			}
 			
 			// BOW and CROSSBOW checks
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index ee7f16229b..ece9ae1c59 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -1051,15 +1051,13 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 			// GeoData Los Check here (or dz > 1000)
 			if (!GeoEngine.getInstance().canSeeTarget(this, target))
 			{
-				if (target.isDoor() && target.isAutoAttackable(this))
+				if (!target.isDoor() || !target.isAutoAttackable(this))
 				{
-					getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, target.getLocation());
+					sendPacket(SystemMessageId.CANNOT_SEE_TARGET);
+					getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+					sendPacket(ActionFailed.STATIC_PACKET);
 					return;
 				}
-				sendPacket(SystemMessageId.CANNOT_SEE_TARGET);
-				getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
-				sendPacket(ActionFailed.STATIC_PACKET);
-				return;
 			}
 			
 			// BOW and CROSSBOW checks
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 dbc506ec2a..4eef55dfff 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
@@ -1009,15 +1009,13 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 			// GeoData Los Check here (or dz > 1000)
 			if (!GeoEngine.getInstance().canSeeTarget(this, target))
 			{
-				if (target.isDoor() && target.isAutoAttackable(this))
+				if (!target.isDoor() || !target.isAutoAttackable(this))
 				{
-					getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, target.getLocation());
+					sendPacket(SystemMessageId.CANNOT_SEE_TARGET);
+					getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+					sendPacket(ActionFailed.STATIC_PACKET);
 					return;
 				}
-				sendPacket(SystemMessageId.CANNOT_SEE_TARGET);
-				getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
-				sendPacket(ActionFailed.STATIC_PACKET);
-				return;
 			}
 			
 			target.getKnownList().addKnownObject(this);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index ee7f16229b..ece9ae1c59 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -1051,15 +1051,13 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 			// GeoData Los Check here (or dz > 1000)
 			if (!GeoEngine.getInstance().canSeeTarget(this, target))
 			{
-				if (target.isDoor() && target.isAutoAttackable(this))
+				if (!target.isDoor() || !target.isAutoAttackable(this))
 				{
-					getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, target.getLocation());
+					sendPacket(SystemMessageId.CANNOT_SEE_TARGET);
+					getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+					sendPacket(ActionFailed.STATIC_PACKET);
 					return;
 				}
-				sendPacket(SystemMessageId.CANNOT_SEE_TARGET);
-				getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
-				sendPacket(ActionFailed.STATIC_PACKET);
-				return;
 			}
 			
 			// BOW and CROSSBOW checks