From e380efd6c20819978b7e6b7e0d001275a0404ced Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 12 Nov 2017 02:39:58 +0000 Subject: [PATCH] Geodata check for previous commit. --- .../gameserver/model/actor/instance/L2DefenderInstance.java | 3 ++- .../gameserver/model/actor/instance/L2DefenderInstance.java | 3 ++- .../gameserver/model/actor/instance/L2DefenderInstance.java | 3 ++- .../gameserver/model/actor/instance/L2DefenderInstance.java | 3 ++- .../gameserver/model/actor/instance/L2DefenderInstance.java | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java index e0f9092b06..55ebf4f5c1 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java @@ -19,6 +19,7 @@ package com.l2jmobius.gameserver.model.actor.instance; import com.l2jmobius.Config; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; +import com.l2jmobius.gameserver.geoengine.GeoEngine; import com.l2jmobius.gameserver.instancemanager.CastleManager; import com.l2jmobius.gameserver.instancemanager.FortManager; import com.l2jmobius.gameserver.model.L2World; @@ -185,7 +186,7 @@ public class L2DefenderInstance extends L2Attackable double lowestHpValue = Double.MAX_VALUE; for (L2Character nearby : L2World.getInstance().getVisibleObjects(this, L2Character.class, skill.getCastRange())) { - if ((nearby == null) || nearby.isDead()) + if ((nearby == null) || nearby.isDead() || !GeoEngine.getInstance().canSeeTarget(this, nearby)) { continue; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java index e0f9092b06..55ebf4f5c1 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java @@ -19,6 +19,7 @@ package com.l2jmobius.gameserver.model.actor.instance; import com.l2jmobius.Config; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; +import com.l2jmobius.gameserver.geoengine.GeoEngine; import com.l2jmobius.gameserver.instancemanager.CastleManager; import com.l2jmobius.gameserver.instancemanager.FortManager; import com.l2jmobius.gameserver.model.L2World; @@ -185,7 +186,7 @@ public class L2DefenderInstance extends L2Attackable double lowestHpValue = Double.MAX_VALUE; for (L2Character nearby : L2World.getInstance().getVisibleObjects(this, L2Character.class, skill.getCastRange())) { - if ((nearby == null) || nearby.isDead()) + if ((nearby == null) || nearby.isDead() || !GeoEngine.getInstance().canSeeTarget(this, nearby)) { continue; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java index e0f9092b06..55ebf4f5c1 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java @@ -19,6 +19,7 @@ package com.l2jmobius.gameserver.model.actor.instance; import com.l2jmobius.Config; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; +import com.l2jmobius.gameserver.geoengine.GeoEngine; import com.l2jmobius.gameserver.instancemanager.CastleManager; import com.l2jmobius.gameserver.instancemanager.FortManager; import com.l2jmobius.gameserver.model.L2World; @@ -185,7 +186,7 @@ public class L2DefenderInstance extends L2Attackable double lowestHpValue = Double.MAX_VALUE; for (L2Character nearby : L2World.getInstance().getVisibleObjects(this, L2Character.class, skill.getCastRange())) { - if ((nearby == null) || nearby.isDead()) + if ((nearby == null) || nearby.isDead() || !GeoEngine.getInstance().canSeeTarget(this, nearby)) { continue; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java index e0f9092b06..55ebf4f5c1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java @@ -19,6 +19,7 @@ package com.l2jmobius.gameserver.model.actor.instance; import com.l2jmobius.Config; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; +import com.l2jmobius.gameserver.geoengine.GeoEngine; import com.l2jmobius.gameserver.instancemanager.CastleManager; import com.l2jmobius.gameserver.instancemanager.FortManager; import com.l2jmobius.gameserver.model.L2World; @@ -185,7 +186,7 @@ public class L2DefenderInstance extends L2Attackable double lowestHpValue = Double.MAX_VALUE; for (L2Character nearby : L2World.getInstance().getVisibleObjects(this, L2Character.class, skill.getCastRange())) { - if ((nearby == null) || nearby.isDead()) + if ((nearby == null) || nearby.isDead() || !GeoEngine.getInstance().canSeeTarget(this, nearby)) { continue; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java index e0f9092b06..55ebf4f5c1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java @@ -19,6 +19,7 @@ package com.l2jmobius.gameserver.model.actor.instance; import com.l2jmobius.Config; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; +import com.l2jmobius.gameserver.geoengine.GeoEngine; import com.l2jmobius.gameserver.instancemanager.CastleManager; import com.l2jmobius.gameserver.instancemanager.FortManager; import com.l2jmobius.gameserver.model.L2World; @@ -185,7 +186,7 @@ public class L2DefenderInstance extends L2Attackable double lowestHpValue = Double.MAX_VALUE; for (L2Character nearby : L2World.getInstance().getVisibleObjects(this, L2Character.class, skill.getCastRange())) { - if ((nearby == null) || nearby.isDead()) + if ((nearby == null) || nearby.isDead() || !GeoEngine.getInstance().canSeeTarget(this, nearby)) { continue; }