From 5f96def70d35590d4b081e9864ab9d7ef1631a25 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 6 Jan 2019 00:28:23 +0000 Subject: [PATCH] GeoEngine check for minimum distance condition. --- .../model/conditions/ConditionMinDistance.java | 18 ++++++++---------- .../model/conditions/ConditionMinDistance.java | 18 ++++++++---------- .../model/conditions/ConditionMinDistance.java | 18 ++++++++---------- .../model/conditions/ConditionMinDistance.java | 18 ++++++++---------- .../model/conditions/ConditionMinDistance.java | 18 ++++++++---------- .../model/conditions/ConditionMinDistance.java | 18 ++++++++---------- .../model/conditions/ConditionMinDistance.java | 18 ++++++++---------- .../model/conditions/ConditionMinDistance.java | 18 ++++++++---------- .../model/conditions/ConditionMinDistance.java | 18 ++++++++---------- .../model/conditions/ConditionMinDistance.java | 18 ++++++++---------- 10 files changed, 80 insertions(+), 100 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java index 25880e13fe..c67021380e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java +++ b/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 Didldak + * @author Mobius */ public class ConditionMinDistance extends Condition { - private final int _sqDistance; + private final int _distance; - /** - * Instantiates a new condition min distance. - * @param sqDistance the sq distance - */ - public ConditionMinDistance(int sqDistance) + public ConditionMinDistance(int distance) { - _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); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java index 25880e13fe..c67021380e 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java +++ b/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 Didldak + * @author Mobius */ public class ConditionMinDistance extends Condition { - private final int _sqDistance; + private final int _distance; - /** - * Instantiates a new condition min distance. - * @param sqDistance the sq distance - */ - public ConditionMinDistance(int sqDistance) + public ConditionMinDistance(int distance) { - _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); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java index 25880e13fe..c67021380e 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java +++ b/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 Didldak + * @author Mobius */ public class ConditionMinDistance extends Condition { - private final int _sqDistance; + private final int _distance; - /** - * Instantiates a new condition min distance. - * @param sqDistance the sq distance - */ - public ConditionMinDistance(int sqDistance) + public ConditionMinDistance(int distance) { - _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); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java index 25880e13fe..c67021380e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java +++ b/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 Didldak + * @author Mobius */ public class ConditionMinDistance extends Condition { - private final int _sqDistance; + private final int _distance; - /** - * Instantiates a new condition min distance. - * @param sqDistance the sq distance - */ - public ConditionMinDistance(int sqDistance) + public ConditionMinDistance(int distance) { - _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); } } diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java index 25880e13fe..c67021380e 100644 --- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java +++ b/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 Didldak + * @author Mobius */ public class ConditionMinDistance extends Condition { - private final int _sqDistance; + private final int _distance; - /** - * Instantiates a new condition min distance. - * @param sqDistance the sq distance - */ - public ConditionMinDistance(int sqDistance) + public ConditionMinDistance(int distance) { - _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); } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java index 25880e13fe..c67021380e 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java +++ b/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 Didldak + * @author Mobius */ public class ConditionMinDistance extends Condition { - private final int _sqDistance; + private final int _distance; - /** - * Instantiates a new condition min distance. - * @param sqDistance the sq distance - */ - public ConditionMinDistance(int sqDistance) + public ConditionMinDistance(int distance) { - _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); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java index 25880e13fe..c67021380e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java +++ b/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 Didldak + * @author Mobius */ public class ConditionMinDistance extends Condition { - private final int _sqDistance; + private final int _distance; - /** - * Instantiates a new condition min distance. - * @param sqDistance the sq distance - */ - public ConditionMinDistance(int sqDistance) + public ConditionMinDistance(int distance) { - _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); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java index 25880e13fe..c67021380e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java +++ b/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 Didldak + * @author Mobius */ public class ConditionMinDistance extends Condition { - private final int _sqDistance; + private final int _distance; - /** - * Instantiates a new condition min distance. - * @param sqDistance the sq distance - */ - public ConditionMinDistance(int sqDistance) + public ConditionMinDistance(int distance) { - _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); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java index 25880e13fe..c67021380e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java +++ b/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 Didldak + * @author Mobius */ public class ConditionMinDistance extends Condition { - private final int _sqDistance; + private final int _distance; - /** - * Instantiates a new condition min distance. - * @param sqDistance the sq distance - */ - public ConditionMinDistance(int sqDistance) + public ConditionMinDistance(int distance) { - _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); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java index 25880e13fe..c67021380e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java +++ b/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 Didldak + * @author Mobius */ public class ConditionMinDistance extends Condition { - private final int _sqDistance; + private final int _distance; - /** - * Instantiates a new condition min distance. - * @param sqDistance the sq distance - */ - public ConditionMinDistance(int sqDistance) + public ConditionMinDistance(int distance) { - _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); } }