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 5f827ebdb8..2b18adc435 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 @@ -934,14 +934,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe sendPacket(ActionFailed.STATIC_PACKET); 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())) { sendPacket(SystemMessageId.FORCE_ATTACK_IS_IMPOSSIBLE_AGAINST_A_TEMPORARY_ALLIED_MEMBER_DURING_A_SIEGE); sendPacket(ActionFailed.STATIC_PACKET); return; } - // Checking if target has moved to peace zone else if (target.isInsidePeaceZone(getActingPlayer())) { @@ -962,13 +960,10 @@ 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.calculateDistance(this, false, false) > 200)) // fix for big door targeting - { - sendPacket(SystemMessageId.CANNOT_SEE_TARGET); - getAI().setIntention(AI_INTENTION_ACTIVE); - sendPacket(ActionFailed.STATIC_PACKET); - return; - } + sendPacket(SystemMessageId.CANNOT_SEE_TARGET); + getAI().setIntention(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 5f827ebdb8..2b18adc435 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 @@ -934,14 +934,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe sendPacket(ActionFailed.STATIC_PACKET); 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())) { sendPacket(SystemMessageId.FORCE_ATTACK_IS_IMPOSSIBLE_AGAINST_A_TEMPORARY_ALLIED_MEMBER_DURING_A_SIEGE); sendPacket(ActionFailed.STATIC_PACKET); return; } - // Checking if target has moved to peace zone else if (target.isInsidePeaceZone(getActingPlayer())) { @@ -962,13 +960,10 @@ 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.calculateDistance(this, false, false) > 200)) // fix for big door targeting - { - sendPacket(SystemMessageId.CANNOT_SEE_TARGET); - getAI().setIntention(AI_INTENTION_ACTIVE); - sendPacket(ActionFailed.STATIC_PACKET); - return; - } + sendPacket(SystemMessageId.CANNOT_SEE_TARGET); + getAI().setIntention(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 5f827ebdb8..2b18adc435 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 @@ -934,14 +934,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe sendPacket(ActionFailed.STATIC_PACKET); 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())) { sendPacket(SystemMessageId.FORCE_ATTACK_IS_IMPOSSIBLE_AGAINST_A_TEMPORARY_ALLIED_MEMBER_DURING_A_SIEGE); sendPacket(ActionFailed.STATIC_PACKET); return; } - // Checking if target has moved to peace zone else if (target.isInsidePeaceZone(getActingPlayer())) { @@ -962,13 +960,10 @@ 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.calculateDistance(this, false, false) > 200)) // fix for big door targeting - { - sendPacket(SystemMessageId.CANNOT_SEE_TARGET); - getAI().setIntention(AI_INTENTION_ACTIVE); - sendPacket(ActionFailed.STATIC_PACKET); - return; - } + sendPacket(SystemMessageId.CANNOT_SEE_TARGET); + getAI().setIntention(AI_INTENTION_ACTIVE); + sendPacket(ActionFailed.STATIC_PACKET); + return; } // BOW and CROSSBOW checks diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 5f827ebdb8..2b18adc435 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -934,14 +934,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe sendPacket(ActionFailed.STATIC_PACKET); 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())) { sendPacket(SystemMessageId.FORCE_ATTACK_IS_IMPOSSIBLE_AGAINST_A_TEMPORARY_ALLIED_MEMBER_DURING_A_SIEGE); sendPacket(ActionFailed.STATIC_PACKET); return; } - // Checking if target has moved to peace zone else if (target.isInsidePeaceZone(getActingPlayer())) { @@ -962,13 +960,10 @@ 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.calculateDistance(this, false, false) > 200)) // fix for big door targeting - { - sendPacket(SystemMessageId.CANNOT_SEE_TARGET); - getAI().setIntention(AI_INTENTION_ACTIVE); - sendPacket(ActionFailed.STATIC_PACKET); - return; - } + sendPacket(SystemMessageId.CANNOT_SEE_TARGET); + getAI().setIntention(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 530de8ec41..861ff05e43 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 @@ -921,7 +921,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe sendPacket(ActionFailed.STATIC_PACKET); 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())) { if (TerritoryWarManager.getInstance().isTWInProgress()) @@ -935,7 +934,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe sendPacket(ActionFailed.STATIC_PACKET); return; } - // Checking if target has moved to peace zone else if (target.isInsidePeaceZone(getActingPlayer())) { @@ -956,13 +954,10 @@ 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.calculateDistance(this, false, false) > 200)) // fix for big door targeting - { - sendPacket(SystemMessageId.CANNOT_SEE_TARGET); - getAI().setIntention(AI_INTENTION_ACTIVE); - sendPacket(ActionFailed.STATIC_PACKET); - return; - } + sendPacket(SystemMessageId.CANNOT_SEE_TARGET); + getAI().setIntention(AI_INTENTION_ACTIVE); + sendPacket(ActionFailed.STATIC_PACKET); + return; } // Mobius: Do not move when attack is launched. 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 5e8737c01d..9cefbaabd8 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 @@ -934,14 +934,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe sendPacket(ActionFailed.STATIC_PACKET); 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())) { sendPacket(SystemMessageId.FORCE_ATTACK_IS_IMPOSSIBLE_AGAINST_A_TEMPORARY_ALLIED_MEMBER_DURING_A_SIEGE); sendPacket(ActionFailed.STATIC_PACKET); return; } - // Checking if target has moved to peace zone else if (target.isInsidePeaceZone(getActingPlayer())) { @@ -962,13 +960,10 @@ 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.calculateDistance(this, false, false) > 200)) // fix for big door targeting - { - sendPacket(SystemMessageId.CANNOT_SEE_TARGET); - getAI().setIntention(AI_INTENTION_ACTIVE); - sendPacket(ActionFailed.STATIC_PACKET); - return; - } + sendPacket(SystemMessageId.CANNOT_SEE_TARGET); + getAI().setIntention(AI_INTENTION_ACTIVE); + sendPacket(ActionFailed.STATIC_PACKET); + return; } // BOW and CROSSBOW checks diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 5e8737c01d..9cefbaabd8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -934,14 +934,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe sendPacket(ActionFailed.STATIC_PACKET); 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())) { sendPacket(SystemMessageId.FORCE_ATTACK_IS_IMPOSSIBLE_AGAINST_A_TEMPORARY_ALLIED_MEMBER_DURING_A_SIEGE); sendPacket(ActionFailed.STATIC_PACKET); return; } - // Checking if target has moved to peace zone else if (target.isInsidePeaceZone(getActingPlayer())) { @@ -962,13 +960,10 @@ 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.calculateDistance(this, false, false) > 200)) // fix for big door targeting - { - sendPacket(SystemMessageId.CANNOT_SEE_TARGET); - getAI().setIntention(AI_INTENTION_ACTIVE); - sendPacket(ActionFailed.STATIC_PACKET); - return; - } + sendPacket(SystemMessageId.CANNOT_SEE_TARGET); + getAI().setIntention(AI_INTENTION_ACTIVE); + sendPacket(ActionFailed.STATIC_PACKET); + return; } // BOW and CROSSBOW checks diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 5e8737c01d..9cefbaabd8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -934,14 +934,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe sendPacket(ActionFailed.STATIC_PACKET); 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())) { sendPacket(SystemMessageId.FORCE_ATTACK_IS_IMPOSSIBLE_AGAINST_A_TEMPORARY_ALLIED_MEMBER_DURING_A_SIEGE); sendPacket(ActionFailed.STATIC_PACKET); return; } - // Checking if target has moved to peace zone else if (target.isInsidePeaceZone(getActingPlayer())) { @@ -962,13 +960,10 @@ 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.calculateDistance(this, false, false) > 200)) // fix for big door targeting - { - sendPacket(SystemMessageId.CANNOT_SEE_TARGET); - getAI().setIntention(AI_INTENTION_ACTIVE); - sendPacket(ActionFailed.STATIC_PACKET); - return; - } + sendPacket(SystemMessageId.CANNOT_SEE_TARGET); + getAI().setIntention(AI_INTENTION_ACTIVE); + sendPacket(ActionFailed.STATIC_PACKET); + return; } // BOW and CROSSBOW checks