Check visibility for skill range condition.

L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java

@@ -16,6 +16,7 @@
  */
 package handlers.skillconditionhandlers;
 
+import com.l2jmobius.gameserver.geoengine.GeoEngine;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
@@ -23,7 +24,7 @@ import com.l2jmobius.gameserver.model.skills.ISkillCondition;
 import com.l2jmobius.gameserver.model.skills.Skill;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class OpCheckCastRangeSkillCondition implements ISkillCondition
 {
@@ -37,6 +38,8 @@ public class OpCheckCastRangeSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(L2Character caster, Skill skill, L2Object target)
 	{
-		return (target != null) && (caster.calculateDistance3D(target) /* for some reason this used Sq3D check */ >= _distance);
+		return (target != null) //
+			&& (caster.calculateDistance3D(target) >= _distance) //
+			&& GeoEngine.getInstance().canSeeTarget(caster, target);
 	}
 }

L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java

@@ -16,6 +16,7 @@
  */
 package handlers.skillconditionhandlers;
 
+import com.l2jmobius.gameserver.geoengine.GeoEngine;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
@@ -23,7 +24,7 @@ import com.l2jmobius.gameserver.model.skills.ISkillCondition;
 import com.l2jmobius.gameserver.model.skills.Skill;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class OpCheckCastRangeSkillCondition implements ISkillCondition
 {
@@ -37,6 +38,8 @@ public class OpCheckCastRangeSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(L2Character caster, Skill skill, L2Object target)
 	{
-		return (target != null) && (caster.calculateDistance3D(target) /* for some reason this used Sq3D check */ >= _distance);
+		return (target != null) //
+			&& (caster.calculateDistance3D(target) >= _distance) //
+			&& GeoEngine.getInstance().canSeeTarget(caster, target);
 	}
 }

L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java

@@ -16,6 +16,7 @@
  */
 package handlers.skillconditionhandlers;
 
+import com.l2jmobius.gameserver.geoengine.GeoEngine;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
@@ -23,7 +24,7 @@ import com.l2jmobius.gameserver.model.skills.ISkillCondition;
 import com.l2jmobius.gameserver.model.skills.Skill;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class OpCheckCastRangeSkillCondition implements ISkillCondition
 {
@@ -37,6 +38,8 @@ public class OpCheckCastRangeSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(L2Character caster, Skill skill, L2Object target)
 	{
-		return (target != null) && (caster.calculateDistance3D(target) /* for some reason this used Sq3D check */ >= _distance);
+		return (target != null) //
+			&& (caster.calculateDistance3D(target) >= _distance) //
+			&& GeoEngine.getInstance().canSeeTarget(caster, target);
 	}
 }

L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java

@@ -16,6 +16,7 @@
  */
 package handlers.skillconditionhandlers;
 
+import com.l2jmobius.gameserver.geoengine.GeoEngine;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
@@ -23,7 +24,7 @@ import com.l2jmobius.gameserver.model.skills.ISkillCondition;
 import com.l2jmobius.gameserver.model.skills.Skill;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class OpCheckCastRangeSkillCondition implements ISkillCondition
 {
@@ -37,6 +38,8 @@ public class OpCheckCastRangeSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(L2Character caster, Skill skill, L2Object target)
 	{
-		return (target != null) && (caster.calculateDistance3D(target) /* for some reason this used Sq3D check */ >= _distance);
+		return (target != null) //
+			&& (caster.calculateDistance3D(target) >= _distance) //
+			&& GeoEngine.getInstance().canSeeTarget(caster, target);
 	}
 }

L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java

@@ -16,6 +16,7 @@
  */
 package handlers.skillconditionhandlers;
 
+import com.l2jmobius.gameserver.geoengine.GeoEngine;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
@@ -23,7 +24,7 @@ import com.l2jmobius.gameserver.model.skills.ISkillCondition;
 import com.l2jmobius.gameserver.model.skills.Skill;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class OpCheckCastRangeSkillCondition implements ISkillCondition
 {
@@ -37,6 +38,8 @@ public class OpCheckCastRangeSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(L2Character caster, Skill skill, L2Object target)
 	{
-		return (target != null) && (caster.calculateDistance3D(target) /* for some reason this used Sq3D check */ >= _distance);
+		return (target != null) //
+			&& (caster.calculateDistance3D(target) >= _distance) //
+			&& GeoEngine.getInstance().canSeeTarget(caster, target);
 	}
 }

L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java

@@ -16,6 +16,7 @@
  */
 package handlers.skillconditionhandlers;
 
+import com.l2jmobius.gameserver.geoengine.GeoEngine;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
@@ -23,7 +24,7 @@ import com.l2jmobius.gameserver.model.skills.ISkillCondition;
 import com.l2jmobius.gameserver.model.skills.Skill;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class OpCheckCastRangeSkillCondition implements ISkillCondition
 {
@@ -37,6 +38,8 @@ public class OpCheckCastRangeSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(L2Character caster, Skill skill, L2Object target)
 	{
-		return (target != null) && (caster.calculateDistance3D(target) /* for some reason this used Sq3D check */ >= _distance);
+		return (target != null) //
+			&& (caster.calculateDistance3D(target) >= _distance) //
+			&& GeoEngine.getInstance().canSeeTarget(caster, target);
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java

@@ -16,30 +16,28 @@
  */
 package com.l2jmobius.gameserver.model.conditions;
 
+import com.l2jmobius.gameserver.geoengine.GeoEngine;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.items.L2Item;
 import com.l2jmobius.gameserver.model.skills.Skill;
 
 /**
- * The Class ConditionMinDistance.
+ * @author Mobius
- * @author Didldak
  */
 public class ConditionMinDistance extends Condition
 {
-	private final int _sqDistance;
+	private final int _distance;
 	
-	/**
+	public ConditionMinDistance(int distance)
-	 * Instantiates a new condition min distance.
-	 * @param sqDistance the sq distance
-	 */
-	public ConditionMinDistance(int sqDistance)
 	{
-		_sqDistance = sqDistance;
+		_distance = distance;
 	}
 	
 	@Override
 	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
 	{
-		return (effected != null) && (effector.calculateDistanceSq3D(effected) >= _sqDistance);
+		return (effected != null) //
+			&& (effector.calculateDistance3D(effected) >= _distance) //
+			&& GeoEngine.getInstance().canSeeTarget(effector, effected);
 	}
 }

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java

@@ -16,6 +16,7 @@
  */
 package handlers.skillconditionhandlers;
 
+import com.l2jmobius.gameserver.geoengine.GeoEngine;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
@@ -23,7 +24,7 @@ import com.l2jmobius.gameserver.model.skills.ISkillCondition;
 import com.l2jmobius.gameserver.model.skills.Skill;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class OpCheckCastRangeSkillCondition implements ISkillCondition
 {
@@ -37,6 +38,8 @@ public class OpCheckCastRangeSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(L2Character caster, Skill skill, L2Object target)
 	{
-		return (target != null) && (caster.calculateDistance3D(target) /* for some reason this used Sq3D check */ >= _distance);
+		return (target != null) //
+			&& (caster.calculateDistance3D(target) >= _distance) //
+			&& GeoEngine.getInstance().canSeeTarget(caster, target);
 	}
 }

L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java

@@ -16,6 +16,7 @@
  */
 package handlers.skillconditionhandlers;
 
+import com.l2jmobius.gameserver.geoengine.GeoEngine;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
@@ -23,7 +24,7 @@ import com.l2jmobius.gameserver.model.skills.ISkillCondition;
 import com.l2jmobius.gameserver.model.skills.Skill;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class OpCheckCastRangeSkillCondition implements ISkillCondition
 {
@@ -37,6 +38,8 @@ public class OpCheckCastRangeSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(L2Character caster, Skill skill, L2Object target)
 	{
-		return (target != null) && (caster.calculateDistance3D(target) /* for some reason this used Sq3D check */ >= _distance);
+		return (target != null) //
+			&& (caster.calculateDistance3D(target) >= _distance) //
+			&& GeoEngine.getInstance().canSeeTarget(caster, target);
 	}
 }

L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java

@@ -16,6 +16,7 @@
  */
 package handlers.skillconditionhandlers;
 
+import com.l2jmobius.gameserver.geoengine.GeoEngine;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
@@ -23,7 +24,7 @@ import com.l2jmobius.gameserver.model.skills.ISkillCondition;
 import com.l2jmobius.gameserver.model.skills.Skill;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class OpCheckCastRangeSkillCondition implements ISkillCondition
 {
@@ -37,6 +38,8 @@ public class OpCheckCastRangeSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(L2Character caster, Skill skill, L2Object target)
 	{
-		return (target != null) && (caster.calculateDistance3D(target) /* for some reason this used Sq3D check */ >= _distance);
+		return (target != null) //
+			&& (caster.calculateDistance3D(target) >= _distance) //
+			&& GeoEngine.getInstance().canSeeTarget(caster, target);
 	}
 }

L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java

@@ -16,6 +16,7 @@
  */
 package handlers.skillconditionhandlers;
 
+import com.l2jmobius.gameserver.geoengine.GeoEngine;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
@@ -23,7 +24,7 @@ import com.l2jmobius.gameserver.model.skills.ISkillCondition;
 import com.l2jmobius.gameserver.model.skills.Skill;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class OpCheckCastRangeSkillCondition implements ISkillCondition
 {
@@ -37,6 +38,8 @@ public class OpCheckCastRangeSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(L2Character caster, Skill skill, L2Object target)
 	{
-		return (target != null) && (caster.calculateDistance3D(target) /* for some reason this used Sq3D check */ >= _distance);
+		return (target != null) //
+			&& (caster.calculateDistance3D(target) >= _distance) //
+			&& GeoEngine.getInstance().canSeeTarget(caster, target);
 	}
 }