GeoEngine check for minimum distance condition.

L2J_Mobius_1.0_Ertheia/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_2.5_Underground/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_3.0_Helios/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_4.0_GrandCrusade/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_5.0_Salvation/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_5.5_EtinasFate/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/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.1_Zaken/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.2_Antharas/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.3_SevenSigns/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);
 	}
 }