lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed siege door targeting with enabled geodata.

Browse Source
This commit is contained in:
MobiusDev
2017-09-07 02:58:22 +00:00
parent b4e0a77538
commit ea14bb8c3e
5 changed files with 20 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@@ -1051,16 +1051,14 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
// GeoData Los Check here (or dz > 1000) // GeoData Los Check here (or dz > 1000)
if (!GeoEngine.getInstance().canSeeTarget(this, target)) 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());
return;
}
sendPacket(SystemMessageId.CANNOT_SEE_TARGET); sendPacket(SystemMessageId.CANNOT_SEE_TARGET);
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
}
// BOW and CROSSBOW checks // BOW and CROSSBOW checks
if ((weaponItem != null) && weaponItem.getItemType().isRanged()) if ((weaponItem != null) && weaponItem.getItemType().isRanged())

6
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@@ -1051,16 +1051,14 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
// GeoData Los Check here (or dz > 1000) // GeoData Los Check here (or dz > 1000)
if (!GeoEngine.getInstance().canSeeTarget(this, target)) 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());
return;
}
sendPacket(SystemMessageId.CANNOT_SEE_TARGET); sendPacket(SystemMessageId.CANNOT_SEE_TARGET);
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
}
// BOW and CROSSBOW checks // BOW and CROSSBOW checks
if ((weaponItem != null) && weaponItem.getItemType().isRanged()) if ((weaponItem != null) && weaponItem.getItemType().isRanged())

6
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@@ -1051,16 +1051,14 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
// GeoData Los Check here (or dz > 1000) // GeoData Los Check here (or dz > 1000)
if (!GeoEngine.getInstance().canSeeTarget(this, target)) 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());
return;
}
sendPacket(SystemMessageId.CANNOT_SEE_TARGET); sendPacket(SystemMessageId.CANNOT_SEE_TARGET);
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
}
// BOW and CROSSBOW checks // BOW and CROSSBOW checks
if ((weaponItem != null) && weaponItem.getItemType().isRanged()) if ((weaponItem != null) && weaponItem.getItemType().isRanged())

6
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@@ -1009,16 +1009,14 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
// GeoData Los Check here (or dz > 1000) // GeoData Los Check here (or dz > 1000)
if (!GeoEngine.getInstance().canSeeTarget(this, target)) 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());
return;
}
sendPacket(SystemMessageId.CANNOT_SEE_TARGET); sendPacket(SystemMessageId.CANNOT_SEE_TARGET);
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
}
target.getKnownList().addKnownObject(this); target.getKnownList().addKnownObject(this);

6
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@@ -1051,16 +1051,14 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
// GeoData Los Check here (or dz > 1000) // GeoData Los Check here (or dz > 1000)
if (!GeoEngine.getInstance().canSeeTarget(this, target)) 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());
return;
}
sendPacket(SystemMessageId.CANNOT_SEE_TARGET); sendPacket(SystemMessageId.CANNOT_SEE_TARGET);
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
}
// BOW and CROSSBOW checks // BOW and CROSSBOW checks
if ((weaponItem != null) && weaponItem.getItemType().isRanged()) if ((weaponItem != null) && weaponItem.getItemType().isRanged())