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

Door distance check should not be necessary.

Browse Source
This commit is contained in:
MobiusDev
2018-09-03 00:01:17 +00:00
parent 118ca0d877
commit 7e2dafb4ff
8 changed files with 32 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -934,14 +934,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
else if ((target.getActingPlayer() != null) && (getActingPlayer().getSiegeState() > 0) && isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeState() == getActingPlayer().getSiegeState()) && (target.getActingPlayer() != this) && (target.getActingPlayer().getSiegeSide() == getActingPlayer().getSiegeSide())) else if ((target.getActingPlayer() != null) && (getActingPlayer().getSiegeState() > 0) && isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeState() == getActingPlayer().getSiegeState()) && (target.getActingPlayer() != this) && (target.getActingPlayer().getSiegeSide() == getActingPlayer().getSiegeSide()))
{ {
sendPacket(SystemMessageId.FORCE_ATTACK_IS_IMPOSSIBLE_AGAINST_A_TEMPORARY_ALLIED_MEMBER_DURING_A_SIEGE); sendPacket(SystemMessageId.FORCE_ATTACK_IS_IMPOSSIBLE_AGAINST_A_TEMPORARY_ALLIED_MEMBER_DURING_A_SIEGE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
// Checking if target has moved to peace zone // Checking if target has moved to peace zone
else if (target.isInsidePeaceZone(getActingPlayer())) else if (target.isInsidePeaceZone(getActingPlayer()))
{ {
@@ -961,15 +959,12 @@ 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.calculateDistance(this, false, false) > 200)) // fix for big door targeting
{ {
sendPacket(SystemMessageId.CANNOT_SEE_TARGET); sendPacket(SystemMessageId.CANNOT_SEE_TARGET);
getAI().setIntention(AI_INTENTION_ACTIVE); getAI().setIntention(AI_INTENTION_ACTIVE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
}
// BOW and CROSSBOW checks // BOW and CROSSBOW checks
if (weaponItem != null) if (weaponItem != null)

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

@@ -934,14 +934,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
else if ((target.getActingPlayer() != null) && (getActingPlayer().getSiegeState() > 0) && isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeState() == getActingPlayer().getSiegeState()) && (target.getActingPlayer() != this) && (target.getActingPlayer().getSiegeSide() == getActingPlayer().getSiegeSide())) else if ((target.getActingPlayer() != null) && (getActingPlayer().getSiegeState() > 0) && isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeState() == getActingPlayer().getSiegeState()) && (target.getActingPlayer() != this) && (target.getActingPlayer().getSiegeSide() == getActingPlayer().getSiegeSide()))
{ {
sendPacket(SystemMessageId.FORCE_ATTACK_IS_IMPOSSIBLE_AGAINST_A_TEMPORARY_ALLIED_MEMBER_DURING_A_SIEGE); sendPacket(SystemMessageId.FORCE_ATTACK_IS_IMPOSSIBLE_AGAINST_A_TEMPORARY_ALLIED_MEMBER_DURING_A_SIEGE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
// Checking if target has moved to peace zone // Checking if target has moved to peace zone
else if (target.isInsidePeaceZone(getActingPlayer())) else if (target.isInsidePeaceZone(getActingPlayer()))
{ {
@@ -961,15 +959,12 @@ 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.calculateDistance(this, false, false) > 200)) // fix for big door targeting
{ {
sendPacket(SystemMessageId.CANNOT_SEE_TARGET); sendPacket(SystemMessageId.CANNOT_SEE_TARGET);
getAI().setIntention(AI_INTENTION_ACTIVE); getAI().setIntention(AI_INTENTION_ACTIVE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
}
// BOW and CROSSBOW checks // BOW and CROSSBOW checks
if (weaponItem != null) if (weaponItem != null)

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

@@ -934,14 +934,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
else if ((target.getActingPlayer() != null) && (getActingPlayer().getSiegeState() > 0) && isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeState() == getActingPlayer().getSiegeState()) && (target.getActingPlayer() != this) && (target.getActingPlayer().getSiegeSide() == getActingPlayer().getSiegeSide())) else if ((target.getActingPlayer() != null) && (getActingPlayer().getSiegeState() > 0) && isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeState() == getActingPlayer().getSiegeState()) && (target.getActingPlayer() != this) && (target.getActingPlayer().getSiegeSide() == getActingPlayer().getSiegeSide()))
{ {
sendPacket(SystemMessageId.FORCE_ATTACK_IS_IMPOSSIBLE_AGAINST_A_TEMPORARY_ALLIED_MEMBER_DURING_A_SIEGE); sendPacket(SystemMessageId.FORCE_ATTACK_IS_IMPOSSIBLE_AGAINST_A_TEMPORARY_ALLIED_MEMBER_DURING_A_SIEGE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
// Checking if target has moved to peace zone // Checking if target has moved to peace zone
else if (target.isInsidePeaceZone(getActingPlayer())) else if (target.isInsidePeaceZone(getActingPlayer()))
{ {
@@ -961,15 +959,12 @@ 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.calculateDistance(this, false, false) > 200)) // fix for big door targeting
{ {
sendPacket(SystemMessageId.CANNOT_SEE_TARGET); sendPacket(SystemMessageId.CANNOT_SEE_TARGET);
getAI().setIntention(AI_INTENTION_ACTIVE); getAI().setIntention(AI_INTENTION_ACTIVE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
}
// BOW and CROSSBOW checks // BOW and CROSSBOW checks
if (weaponItem != null) if (weaponItem != null)

5
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@@ -934,14 +934,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
else if ((target.getActingPlayer() != null) && (getActingPlayer().getSiegeState() > 0) && isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeState() == getActingPlayer().getSiegeState()) && (target.getActingPlayer() != this) && (target.getActingPlayer().getSiegeSide() == getActingPlayer().getSiegeSide())) else if ((target.getActingPlayer() != null) && (getActingPlayer().getSiegeState() > 0) && isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeState() == getActingPlayer().getSiegeState()) && (target.getActingPlayer() != this) && (target.getActingPlayer().getSiegeSide() == getActingPlayer().getSiegeSide()))
{ {
sendPacket(SystemMessageId.FORCE_ATTACK_IS_IMPOSSIBLE_AGAINST_A_TEMPORARY_ALLIED_MEMBER_DURING_A_SIEGE); sendPacket(SystemMessageId.FORCE_ATTACK_IS_IMPOSSIBLE_AGAINST_A_TEMPORARY_ALLIED_MEMBER_DURING_A_SIEGE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
// Checking if target has moved to peace zone // Checking if target has moved to peace zone
else if (target.isInsidePeaceZone(getActingPlayer())) else if (target.isInsidePeaceZone(getActingPlayer()))
{ {
@@ -961,15 +959,12 @@ 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.calculateDistance(this, false, false) > 200)) // fix for big door targeting
{ {
sendPacket(SystemMessageId.CANNOT_SEE_TARGET); sendPacket(SystemMessageId.CANNOT_SEE_TARGET);
getAI().setIntention(AI_INTENTION_ACTIVE); getAI().setIntention(AI_INTENTION_ACTIVE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
}
// BOW and CROSSBOW checks // BOW and CROSSBOW checks
if (weaponItem != null) if (weaponItem != null)

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

@@ -921,7 +921,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
else if ((target.getActingPlayer() != null) && (getActingPlayer().getSiegeState() > 0) && isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeState() == getActingPlayer().getSiegeState()) && (target.getActingPlayer() != this) && (target.getActingPlayer().getSiegeSide() == getActingPlayer().getSiegeSide())) else if ((target.getActingPlayer() != null) && (getActingPlayer().getSiegeState() > 0) && isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeState() == getActingPlayer().getSiegeState()) && (target.getActingPlayer() != this) && (target.getActingPlayer().getSiegeSide() == getActingPlayer().getSiegeSide()))
{ {
if (TerritoryWarManager.getInstance().isTWInProgress()) if (TerritoryWarManager.getInstance().isTWInProgress())
@@ -935,7 +934,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
// Checking if target has moved to peace zone // Checking if target has moved to peace zone
else if (target.isInsidePeaceZone(getActingPlayer())) else if (target.isInsidePeaceZone(getActingPlayer()))
{ {
@@ -955,15 +953,12 @@ 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.calculateDistance(this, false, false) > 200)) // fix for big door targeting
{ {
sendPacket(SystemMessageId.CANNOT_SEE_TARGET); sendPacket(SystemMessageId.CANNOT_SEE_TARGET);
getAI().setIntention(AI_INTENTION_ACTIVE); getAI().setIntention(AI_INTENTION_ACTIVE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
}
// Mobius: Do not move when attack is launched. // Mobius: Do not move when attack is launched.
if (isMoving()) if (isMoving())

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

@@ -934,14 +934,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
else if ((target.getActingPlayer() != null) && (getActingPlayer().getSiegeState() > 0) && isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeState() == getActingPlayer().getSiegeState()) && (target.getActingPlayer() != this) && (target.getActingPlayer().getSiegeSide() == getActingPlayer().getSiegeSide())) else if ((target.getActingPlayer() != null) && (getActingPlayer().getSiegeState() > 0) && isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeState() == getActingPlayer().getSiegeState()) && (target.getActingPlayer() != this) && (target.getActingPlayer().getSiegeSide() == getActingPlayer().getSiegeSide()))
{ {
sendPacket(SystemMessageId.FORCE_ATTACK_IS_IMPOSSIBLE_AGAINST_A_TEMPORARY_ALLIED_MEMBER_DURING_A_SIEGE); sendPacket(SystemMessageId.FORCE_ATTACK_IS_IMPOSSIBLE_AGAINST_A_TEMPORARY_ALLIED_MEMBER_DURING_A_SIEGE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
// Checking if target has moved to peace zone // Checking if target has moved to peace zone
else if (target.isInsidePeaceZone(getActingPlayer())) else if (target.isInsidePeaceZone(getActingPlayer()))
{ {
@@ -961,15 +959,12 @@ 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.calculateDistance(this, false, false) > 200)) // fix for big door targeting
{ {
sendPacket(SystemMessageId.CANNOT_SEE_TARGET); sendPacket(SystemMessageId.CANNOT_SEE_TARGET);
getAI().setIntention(AI_INTENTION_ACTIVE); getAI().setIntention(AI_INTENTION_ACTIVE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
}
// BOW and CROSSBOW checks // BOW and CROSSBOW checks
if (weaponItem != null) if (weaponItem != null)

5
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@@ -934,14 +934,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
else if ((target.getActingPlayer() != null) && (getActingPlayer().getSiegeState() > 0) && isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeState() == getActingPlayer().getSiegeState()) && (target.getActingPlayer() != this) && (target.getActingPlayer().getSiegeSide() == getActingPlayer().getSiegeSide())) else if ((target.getActingPlayer() != null) && (getActingPlayer().getSiegeState() > 0) && isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeState() == getActingPlayer().getSiegeState()) && (target.getActingPlayer() != this) && (target.getActingPlayer().getSiegeSide() == getActingPlayer().getSiegeSide()))
{ {
sendPacket(SystemMessageId.FORCE_ATTACK_IS_IMPOSSIBLE_AGAINST_A_TEMPORARY_ALLIED_MEMBER_DURING_A_SIEGE); sendPacket(SystemMessageId.FORCE_ATTACK_IS_IMPOSSIBLE_AGAINST_A_TEMPORARY_ALLIED_MEMBER_DURING_A_SIEGE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
// Checking if target has moved to peace zone // Checking if target has moved to peace zone
else if (target.isInsidePeaceZone(getActingPlayer())) else if (target.isInsidePeaceZone(getActingPlayer()))
{ {
@@ -961,15 +959,12 @@ 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.calculateDistance(this, false, false) > 200)) // fix for big door targeting
{ {
sendPacket(SystemMessageId.CANNOT_SEE_TARGET); sendPacket(SystemMessageId.CANNOT_SEE_TARGET);
getAI().setIntention(AI_INTENTION_ACTIVE); getAI().setIntention(AI_INTENTION_ACTIVE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
}
// BOW and CROSSBOW checks // BOW and CROSSBOW checks
if (weaponItem != null) if (weaponItem != null)

5
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@@ -934,14 +934,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
else if ((target.getActingPlayer() != null) && (getActingPlayer().getSiegeState() > 0) && isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeState() == getActingPlayer().getSiegeState()) && (target.getActingPlayer() != this) && (target.getActingPlayer().getSiegeSide() == getActingPlayer().getSiegeSide())) else if ((target.getActingPlayer() != null) && (getActingPlayer().getSiegeState() > 0) && isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeState() == getActingPlayer().getSiegeState()) && (target.getActingPlayer() != this) && (target.getActingPlayer().getSiegeSide() == getActingPlayer().getSiegeSide()))
{ {
sendPacket(SystemMessageId.FORCE_ATTACK_IS_IMPOSSIBLE_AGAINST_A_TEMPORARY_ALLIED_MEMBER_DURING_A_SIEGE); sendPacket(SystemMessageId.FORCE_ATTACK_IS_IMPOSSIBLE_AGAINST_A_TEMPORARY_ALLIED_MEMBER_DURING_A_SIEGE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
// Checking if target has moved to peace zone // Checking if target has moved to peace zone
else if (target.isInsidePeaceZone(getActingPlayer())) else if (target.isInsidePeaceZone(getActingPlayer()))
{ {
@@ -961,15 +959,12 @@ 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.calculateDistance(this, false, false) > 200)) // fix for big door targeting
{ {
sendPacket(SystemMessageId.CANNOT_SEE_TARGET); sendPacket(SystemMessageId.CANNOT_SEE_TARGET);
getAI().setIntention(AI_INTENTION_ACTIVE); getAI().setIntention(AI_INTENTION_ACTIVE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
}
// BOW and CROSSBOW checks // BOW and CROSSBOW checks
if (weaponItem != null) if (weaponItem != null)