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

Addition of ConditionPlayerCanTakeCastle range checks.

Browse Source 
Contributed by Sahar.
This commit is contained in:
MobiusDevelopment
2021-02-21 04:58:49 +00:00
parent 970be046f6
commit 73c9361354
19 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java
View File

@@ -68,7 +68,7 @@ public class ConditionPlayerCanTakeCastle extends Condition
player.sendPacket(SystemMessageId.INVALID_TARGET); player.sendPacket(SystemMessageId.INVALID_TARGET);
canTakeCastle = false; canTakeCastle = false;
} }
else if (!Util.checkIfInRange(skill.getCastRange(), player, effected, true)) else if (!Util.checkIfInRange(200, player, effected, true) || (player.getZ() < effected.getZ()) || (Math.abs(player.getZ() - effected.getZ()) > 40))
{ {
player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED); player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
canTakeCastle = false; canTakeCastle = false;

2
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java
View File

@@ -68,7 +68,7 @@ public class ConditionPlayerCanTakeCastle extends Condition
player.sendPacket(SystemMessageId.INVALID_TARGET); player.sendPacket(SystemMessageId.INVALID_TARGET);
canTakeCastle = false; canTakeCastle = false;
} }
else if (!Util.checkIfInRange(skill.getCastRange(), player, effected, true)) else if (!Util.checkIfInRange(200, player, effected, true) || (player.getZ() < effected.getZ()) || (Math.abs(player.getZ() - effected.getZ()) > 40))
{ {
player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED); player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
canTakeCastle = false; canTakeCastle = false;

2
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java
View File

@@ -68,7 +68,7 @@ public class ConditionPlayerCanTakeCastle extends Condition
player.sendPacket(SystemMessageId.INVALID_TARGET); player.sendPacket(SystemMessageId.INVALID_TARGET);
canTakeCastle = false; canTakeCastle = false;
} }
else if (!Util.checkIfInRange(skill.getCastRange(), player, effected, true)) else if (!Util.checkIfInRange(200, player, effected, true) || (player.getZ() < effected.getZ()) || (Math.abs(player.getZ() - effected.getZ()) > 40))
{ {
player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED); player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
canTakeCastle = false; canTakeCastle = false;

2
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java
View File

@@ -68,7 +68,7 @@ public class ConditionPlayerCanTakeCastle extends Condition
player.sendPacket(SystemMessageId.INVALID_TARGET); player.sendPacket(SystemMessageId.INVALID_TARGET);
canTakeCastle = false; canTakeCastle = false;
} }
else if (!Util.checkIfInRange(skill.getCastRange(), player, effected, true)) else if (!Util.checkIfInRange(200, player, effected, true) || (player.getZ() < effected.getZ()) || (Math.abs(player.getZ() - effected.getZ()) > 40))
{ {
player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED); player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
canTakeCastle = false; canTakeCastle = false;

2
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java
View File

@@ -68,7 +68,7 @@ public class ConditionPlayerCanTakeCastle extends Condition
player.sendPacket(SystemMessageId.INVALID_TARGET); player.sendPacket(SystemMessageId.INVALID_TARGET);
canTakeCastle = false; canTakeCastle = false;
} }
else if (!Util.checkIfInRange(skill.getCastRange(), player, effected, true)) else if (!Util.checkIfInRange(200, player, effected, true) || (player.getZ() < effected.getZ()) || (Math.abs(player.getZ() - effected.getZ()) > 40))
{ {
player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED); player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
canTakeCastle = false; canTakeCastle = false;

2
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java
View File

@@ -68,7 +68,7 @@ public class ConditionPlayerCanTakeCastle extends Condition
player.sendPacket(SystemMessageId.INVALID_TARGET); player.sendPacket(SystemMessageId.INVALID_TARGET);
canTakeCastle = false; canTakeCastle = false;
} }
else if (!Util.checkIfInRange(skill.getCastRange(), player, effected, true)) else if (!Util.checkIfInRange(200, player, effected, true) || (player.getZ() < effected.getZ()) || (Math.abs(player.getZ() - effected.getZ()) > 40))
{ {
player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED); player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
canTakeCastle = false; canTakeCastle = false;

2
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java
View File

@@ -68,7 +68,7 @@ public class ConditionPlayerCanTakeCastle extends Condition
player.sendPacket(SystemMessageId.INVALID_TARGET); player.sendPacket(SystemMessageId.INVALID_TARGET);
canTakeCastle = false; canTakeCastle = false;
} }
else if (!Util.checkIfInRange(skill.getCastRange(), player, effected, true)) else if (!Util.checkIfInRange(200, player, effected, true) || (player.getZ() < effected.getZ()) || (Math.abs(player.getZ() - effected.getZ()) > 40))
{ {
player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED); player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
canTakeCastle = false; canTakeCastle = false;

2
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java
View File

@@ -68,7 +68,7 @@ public class ConditionPlayerCanTakeCastle extends Condition
player.sendPacket(SystemMessageId.INVALID_TARGET); player.sendPacket(SystemMessageId.INVALID_TARGET);
canTakeCastle = false; canTakeCastle = false;
} }
else if (!Util.checkIfInRange(skill.getCastRange(), player, effected, true)) else if (!Util.checkIfInRange(200, player, effected, true) || (player.getZ() < effected.getZ()) || (Math.abs(player.getZ() - effected.getZ()) > 40))
{ {
player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED); player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
canTakeCastle = false; canTakeCastle = false;

2
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java
View File

@@ -68,7 +68,7 @@ public class ConditionPlayerCanTakeCastle extends Condition
player.sendPacket(SystemMessageId.INVALID_TARGET); player.sendPacket(SystemMessageId.INVALID_TARGET);
canTakeCastle = false; canTakeCastle = false;
} }
else if (!Util.checkIfInRange(skill.getCastRange(), player, effected, true)) else if (!Util.checkIfInRange(200, player, effected, true) || (player.getZ() < effected.getZ()) || (Math.abs(player.getZ() - effected.getZ()) > 40))
{ {
player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED); player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
canTakeCastle = false; canTakeCastle = false;

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java
View File

@@ -60,7 +60,7 @@ public class ConditionPlayerCanTakeCastle extends Condition
player.sendPacket(SystemMessageId.INVALID_TARGET); player.sendPacket(SystemMessageId.INVALID_TARGET);
return false; return false;
} }
else if (!Util.checkIfInRange(skill.getCastRange(), player, effected, true) || (Math.abs(player.getZ() - effected.getZ()) > 40)) else if (!Util.checkIfInRange(200, player, effected, true) || (player.getZ() < effected.getZ()) || (Math.abs(player.getZ() - effected.getZ()) > 40))
{ {
player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED); player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
return false; return false;

2
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java
View File

@@ -60,7 +60,7 @@ public class ConditionPlayerCanTakeCastle extends Condition
player.sendPacket(SystemMessageId.INVALID_TARGET); player.sendPacket(SystemMessageId.INVALID_TARGET);
return false; return false;
} }
else if (!Util.checkIfInRange(skill.getCastRange(), player, effected, true) || (Math.abs(player.getZ() - effected.getZ()) > 40)) else if (!Util.checkIfInRange(200, player, effected, true) || (player.getZ() < effected.getZ()) || (Math.abs(player.getZ() - effected.getZ()) > 40))
{ {
player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED); player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
return false; return false;

2
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java
View File

@@ -68,7 +68,7 @@ public class ConditionPlayerCanTakeCastle extends Condition
player.sendPacket(SystemMessageId.INVALID_TARGET); player.sendPacket(SystemMessageId.INVALID_TARGET);
canTakeCastle = false; canTakeCastle = false;
} }
else if (!Util.checkIfInRange(skill.getCastRange(), player, effected, true)) else if (!Util.checkIfInRange(200, player, effected, true) || (player.getZ() < effected.getZ()) || (Math.abs(player.getZ() - effected.getZ()) > 40))
{ {
player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED); player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED);
canTakeCastle = false; canTakeCastle = false;

2
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java
View File

@@ -68,7 +68,7 @@ public class ConditionPlayerCanTakeCastle extends Condition
player.sendPacket(SystemMessageId.INVALID_TARGET); player.sendPacket(SystemMessageId.INVALID_TARGET);
canTakeCastle = false; canTakeCastle = false;
} }
else if (!Util.checkIfInRange(skill.getCastRange(), player, effected, true)) else if (!Util.checkIfInRange(200, player, effected, true) || (player.getZ() < effected.getZ()) || (Math.abs(player.getZ() - effected.getZ()) > 40))
{ {
player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED); player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED);
canTakeCastle = false; canTakeCastle = false;

2
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java
View File

@@ -68,7 +68,7 @@ public class ConditionPlayerCanTakeCastle extends Condition
player.sendPacket(SystemMessageId.INVALID_TARGET); player.sendPacket(SystemMessageId.INVALID_TARGET);
canTakeCastle = false; canTakeCastle = false;
} }
else if (!Util.checkIfInRange(skill.getCastRange(), player, effected, true)) else if (!Util.checkIfInRange(200, player, effected, true) || (player.getZ() < effected.getZ()) || (Math.abs(player.getZ() - effected.getZ()) > 40))
{ {
player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED); player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED);
canTakeCastle = false; canTakeCastle = false;

2
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java
View File

@@ -68,7 +68,7 @@ public class ConditionPlayerCanTakeCastle extends Condition
player.sendPacket(SystemMessageId.INVALID_TARGET); player.sendPacket(SystemMessageId.INVALID_TARGET);
canTakeCastle = false; canTakeCastle = false;
} }
else if (!Util.checkIfInRange(skill.getCastRange(), player, effected, true)) else if (!Util.checkIfInRange(200, player, effected, true) || (player.getZ() < effected.getZ()) || (Math.abs(player.getZ() - effected.getZ()) > 40))
{ {
player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED); player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED);
canTakeCastle = false; canTakeCastle = false;

2
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java
View File

@@ -68,7 +68,7 @@ public class ConditionPlayerCanTakeCastle extends Condition
player.sendPacket(SystemMessageId.INVALID_TARGET); player.sendPacket(SystemMessageId.INVALID_TARGET);
canTakeCastle = false; canTakeCastle = false;
} }
else if (!Util.checkIfInRange(skill.getCastRange(), player, effected, true)) else if (!Util.checkIfInRange(200, player, effected, true) || (player.getZ() < effected.getZ()) || (Math.abs(player.getZ() - effected.getZ()) > 40))
{ {
player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED); player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED);
canTakeCastle = false; canTakeCastle = false;

2
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java
View File

@@ -68,7 +68,7 @@ public class ConditionPlayerCanTakeCastle extends Condition
player.sendPacket(SystemMessageId.INVALID_TARGET); player.sendPacket(SystemMessageId.INVALID_TARGET);
canTakeCastle = false; canTakeCastle = false;
} }
else if (!Util.checkIfInRange(skill.getCastRange(), player, effected, true)) else if (!Util.checkIfInRange(200, player, effected, true) || (player.getZ() < effected.getZ()) || (Math.abs(player.getZ() - effected.getZ()) > 40))
{ {
player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED); player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED);
canTakeCastle = false; canTakeCastle = false;

2
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java
View File

@@ -68,7 +68,7 @@ public class ConditionPlayerCanTakeCastle extends Condition
player.sendPacket(SystemMessageId.INVALID_TARGET); player.sendPacket(SystemMessageId.INVALID_TARGET);
canTakeCastle = false; canTakeCastle = false;
} }
else if (!Util.checkIfInRange(skill.getCastRange(), player, effected, true)) else if (!Util.checkIfInRange(200, player, effected, true) || (player.getZ() < effected.getZ()) || (Math.abs(player.getZ() - effected.getZ()) > 40))
{ {
player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED); player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED);
canTakeCastle = false; canTakeCastle = false;

2
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java
View File

@@ -68,7 +68,7 @@ public class ConditionPlayerCanTakeCastle extends Condition
player.sendPacket(SystemMessageId.INVALID_TARGET); player.sendPacket(SystemMessageId.INVALID_TARGET);
canTakeCastle = false; canTakeCastle = false;
} }
else if (!Util.checkIfInRange(skill.getCastRange(), player, effected, true)) else if (!Util.checkIfInRange(200, player, effected, true) || (player.getZ() < effected.getZ()) || (Math.abs(player.getZ() - effected.getZ()) > 40))
{ {
player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED); player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED);
canTakeCastle = false; canTakeCastle = false;