diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java index 21c2b257db..6ca32e5eb6 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -5461,9 +5461,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe World.getInstance().forEachVisibleObjectInRange(this, Creature.class, _seenCreatureRange, creature -> { - if (!creature.isInvisible() && _seenCreatures.add(creature)) + if (!creature.isInvisible()) { - EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + final WorldRegion worldRegion = getWorldRegion(); + if ((worldRegion != null) && worldRegion.areNeighborsActive() && _seenCreatures.add(creature)) + { + EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + } } }); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java index 21c2b257db..6ca32e5eb6 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -5461,9 +5461,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe World.getInstance().forEachVisibleObjectInRange(this, Creature.class, _seenCreatureRange, creature -> { - if (!creature.isInvisible() && _seenCreatures.add(creature)) + if (!creature.isInvisible()) { - EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + final WorldRegion worldRegion = getWorldRegion(); + if ((worldRegion != null) && worldRegion.areNeighborsActive() && _seenCreatures.add(creature)) + { + EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + } } }); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java index e5fdaba718..b3c9eb8bca 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -5461,9 +5461,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe World.getInstance().forEachVisibleObjectInRange(this, Creature.class, _seenCreatureRange, creature -> { - if (!creature.isInvisible() && _seenCreatures.add(creature)) + if (!creature.isInvisible()) { - EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + final WorldRegion worldRegion = getWorldRegion(); + if ((worldRegion != null) && worldRegion.areNeighborsActive() && _seenCreatures.add(creature)) + { + EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + } } }); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java index e5fdaba718..b3c9eb8bca 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -5461,9 +5461,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe World.getInstance().forEachVisibleObjectInRange(this, Creature.class, _seenCreatureRange, creature -> { - if (!creature.isInvisible() && _seenCreatures.add(creature)) + if (!creature.isInvisible()) { - EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + final WorldRegion worldRegion = getWorldRegion(); + if ((worldRegion != null) && worldRegion.areNeighborsActive() && _seenCreatures.add(creature)) + { + EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + } } }); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java index c65a2bc546..eb0cc6a4d6 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -5470,9 +5470,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe World.getInstance().forEachVisibleObjectInRange(this, Creature.class, _seenCreatureRange, creature -> { - if (!creature.isInvisible() && _seenCreatures.add(creature)) + if (!creature.isInvisible()) { - EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + final WorldRegion worldRegion = getWorldRegion(); + if ((worldRegion != null) && worldRegion.areNeighborsActive() && _seenCreatures.add(creature)) + { + EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + } } }); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java index c65a2bc546..eb0cc6a4d6 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -5470,9 +5470,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe World.getInstance().forEachVisibleObjectInRange(this, Creature.class, _seenCreatureRange, creature -> { - if (!creature.isInvisible() && _seenCreatures.add(creature)) + if (!creature.isInvisible()) { - EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + final WorldRegion worldRegion = getWorldRegion(); + if ((worldRegion != null) && worldRegion.areNeighborsActive() && _seenCreatures.add(creature)) + { + EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + } } }); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java index c65a2bc546..eb0cc6a4d6 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -5470,9 +5470,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe World.getInstance().forEachVisibleObjectInRange(this, Creature.class, _seenCreatureRange, creature -> { - if (!creature.isInvisible() && _seenCreatures.add(creature)) + if (!creature.isInvisible()) { - EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + final WorldRegion worldRegion = getWorldRegion(); + if ((worldRegion != null) && worldRegion.areNeighborsActive() && _seenCreatures.add(creature)) + { + EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + } } }); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java index cf9d421028..1a951a259b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -5469,9 +5469,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe World.getInstance().forEachVisibleObjectInRange(this, Creature.class, _seenCreatureRange, creature -> { - if (!creature.isInvisible() && _seenCreatures.add(creature)) + if (!creature.isInvisible()) { - EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + final WorldRegion worldRegion = getWorldRegion(); + if ((worldRegion != null) && worldRegion.areNeighborsActive() && _seenCreatures.add(creature)) + { + EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + } } }); } diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java index ae9a6c1e8d..5a3f2a2dd6 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -5469,9 +5469,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe World.getInstance().forEachVisibleObjectInRange(this, Creature.class, _seenCreatureRange, creature -> { - if (!creature.isInvisible() && _seenCreatures.add(creature)) + if (!creature.isInvisible()) { - EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + final WorldRegion worldRegion = getWorldRegion(); + if ((worldRegion != null) && worldRegion.areNeighborsActive() && _seenCreatures.add(creature)) + { + EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + } } }); } diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java index ae9a6c1e8d..5a3f2a2dd6 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -5469,9 +5469,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe World.getInstance().forEachVisibleObjectInRange(this, Creature.class, _seenCreatureRange, creature -> { - if (!creature.isInvisible() && _seenCreatures.add(creature)) + if (!creature.isInvisible()) { - EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + final WorldRegion worldRegion = getWorldRegion(); + if ((worldRegion != null) && worldRegion.areNeighborsActive() && _seenCreatures.add(creature)) + { + EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + } } }); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java index 001d732991..0d86cacf8b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -6794,9 +6794,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe World.getInstance().forEachVisibleObjectInRange(this, Creature.class, _seenCreatureRange, creature -> { - if (!creature.isInvisible() && _seenCreatures.add(creature)) + if (!creature.isInvisible()) { - EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + final WorldRegion worldRegion = getWorldRegion(); + if ((worldRegion != null) && worldRegion.areNeighborsActive() && _seenCreatures.add(creature)) + { + EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + } } }); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java index 25eb22b786..c96117ecf0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -6796,9 +6796,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe World.getInstance().forEachVisibleObjectInRange(this, Creature.class, _seenCreatureRange, creature -> { - if (!creature.isInvisible() && _seenCreatures.add(creature)) + if (!creature.isInvisible()) { - EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + final WorldRegion worldRegion = getWorldRegion(); + if ((worldRegion != null) && worldRegion.areNeighborsActive() && _seenCreatures.add(creature)) + { + EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + } } }); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java index 3d8afebfae..8ed8ef9f6f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -5460,9 +5460,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe World.getInstance().forEachVisibleObjectInRange(this, Creature.class, _seenCreatureRange, creature -> { - if (!creature.isInvisible() && _seenCreatures.add(creature)) + if (!creature.isInvisible()) { - EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + final WorldRegion worldRegion = getWorldRegion(); + if ((worldRegion != null) && worldRegion.areNeighborsActive() && _seenCreatures.add(creature)) + { + EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + } } }); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java index 3d8afebfae..8ed8ef9f6f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -5460,9 +5460,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe World.getInstance().forEachVisibleObjectInRange(this, Creature.class, _seenCreatureRange, creature -> { - if (!creature.isInvisible() && _seenCreatures.add(creature)) + if (!creature.isInvisible()) { - EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + final WorldRegion worldRegion = getWorldRegion(); + if ((worldRegion != null) && worldRegion.areNeighborsActive() && _seenCreatures.add(creature)) + { + EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + } } }); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java index 837b667fed..9cb35298f0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -5469,9 +5469,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe World.getInstance().forEachVisibleObjectInRange(this, Creature.class, _seenCreatureRange, creature -> { - if (!creature.isInvisible() && _seenCreatures.add(creature)) + if (!creature.isInvisible()) { - EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + final WorldRegion worldRegion = getWorldRegion(); + if ((worldRegion != null) && worldRegion.areNeighborsActive() && _seenCreatures.add(creature)) + { + EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + } } }); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java index d6828d9647..0fc8560378 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -5494,9 +5494,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe World.getInstance().forEachVisibleObjectInRange(this, Creature.class, _seenCreatureRange, creature -> { - if (!creature.isInvisible() && _seenCreatures.add(creature)) + if (!creature.isInvisible()) { - EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + final WorldRegion worldRegion = getWorldRegion(); + if ((worldRegion != null) && worldRegion.areNeighborsActive() && _seenCreatures.add(creature)) + { + EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + } } }); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java index d6828d9647..0fc8560378 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -5494,9 +5494,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe World.getInstance().forEachVisibleObjectInRange(this, Creature.class, _seenCreatureRange, creature -> { - if (!creature.isInvisible() && _seenCreatures.add(creature)) + if (!creature.isInvisible()) { - EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + final WorldRegion worldRegion = getWorldRegion(); + if ((worldRegion != null) && worldRegion.areNeighborsActive() && _seenCreatures.add(creature)) + { + EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + } } }); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java index e6610d6fc3..ad69ca6e69 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -5493,9 +5493,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe World.getInstance().forEachVisibleObjectInRange(this, Creature.class, _seenCreatureRange, creature -> { - if (!creature.isInvisible() && _seenCreatures.add(creature)) + if (!creature.isInvisible()) { - EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + final WorldRegion worldRegion = getWorldRegion(); + if ((worldRegion != null) && worldRegion.areNeighborsActive() && _seenCreatures.add(creature)) + { + EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + } } }); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java index 3d8afebfae..8ed8ef9f6f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -5460,9 +5460,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe World.getInstance().forEachVisibleObjectInRange(this, Creature.class, _seenCreatureRange, creature -> { - if (!creature.isInvisible() && _seenCreatures.add(creature)) + if (!creature.isInvisible()) { - EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + final WorldRegion worldRegion = getWorldRegion(); + if ((worldRegion != null) && worldRegion.areNeighborsActive() && _seenCreatures.add(creature)) + { + EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + } } }); } diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java index 26307f813a..ca7a9249c0 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -5503,9 +5503,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe World.getInstance().forEachVisibleObjectInRange(this, Creature.class, _seenCreatureRange, creature -> { - if (!creature.isInvisible() && _seenCreatures.add(creature)) + if (!creature.isInvisible()) { - EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + final WorldRegion worldRegion = getWorldRegion(); + if ((worldRegion != null) && worldRegion.areNeighborsActive() && _seenCreatures.add(creature)) + { + EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + } } }); } diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/Creature.java index e15ba3067b..91743dece7 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -5510,9 +5510,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe World.getInstance().forEachVisibleObjectInRange(this, Creature.class, _seenCreatureRange, creature -> { - if (!creature.isInvisible() && _seenCreatures.add(creature)) + if (!creature.isInvisible()) { - EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + final WorldRegion worldRegion = getWorldRegion(); + if ((worldRegion != null) && worldRegion.areNeighborsActive() && _seenCreatures.add(creature)) + { + EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + } } }); } diff --git a/L2J_Mobius_Essence_5.5_FrostLord/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Essence_5.5_FrostLord/java/org/l2jmobius/gameserver/model/actor/Creature.java index e15ba3067b..91743dece7 100644 --- a/L2J_Mobius_Essence_5.5_FrostLord/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Essence_5.5_FrostLord/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -5510,9 +5510,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe World.getInstance().forEachVisibleObjectInRange(this, Creature.class, _seenCreatureRange, creature -> { - if (!creature.isInvisible() && _seenCreatures.add(creature)) + if (!creature.isInvisible()) { - EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + final WorldRegion worldRegion = getWorldRegion(); + if ((worldRegion != null) && worldRegion.areNeighborsActive() && _seenCreatures.add(creature)) + { + EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee(this, creature), this); + } } }); }