lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Automatic seen creature initialization for registered NPC ids.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-06-22 23:01:45 +00:00
parent ce1873a639
commit 3cc620ba43
44 changed files with 484 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Npc.java
View File

@@ -21,6 +21,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
@@ -114,6 +115,8 @@ public class Npc extends Creature
public static final int INTERACTION_DISTANCE = 250;
/** Maximum distance where the drop may appear given this NPC position. */
public static final int RANDOM_ITEM_DROP_LIMIT = 70;
/** Ids of NPCs that see creatures through the OnCreatureSee event. */
private static final Set<Integer> CREATURE_SEE_IDS = ConcurrentHashMap.newKeySet();
/** The Spawn object that manage this NpcInstance */
private Spawn _spawn;
/** The flag to specify if this NpcInstance is busy */
@@ -1272,6 +1275,7 @@ public class Npc extends Creature
_killingBlowWeaponId = 0;
_isRandomAnimationEnabled = getTemplate().isRandomAnimationEnabled();
_isRandomWalkingEnabled = !WalkingManager.getInstance().isTargeted(this) && getTemplate().isRandomWalkEnabled();
if (isTeleporting())
{
EventDispatcher.getInstance().notifyEventAsync(new OnNpcTeleport(this), this);
@@ -1285,6 +1289,16 @@ public class Npc extends Creature
{
WalkingManager.getInstance().onSpawn(this);
}
if (CREATURE_SEE_IDS.contains(getId()))
{
initSeenCreatures();
}
}
public static void addCreatureSeeId(int id)
{
CREATURE_SEE_IDS.add(id);
}
/**

8
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
View File

@@ -843,6 +843,10 @@ public abstract class AbstractScript extends ManagedScript
*/
protected final List<AbstractEventListener> setCreatureSeeId(Consumer<OnCreatureSee> callback, int... npcIds)
{
for (int id : npcIds)
{
Npc.addCreatureSeeId(id);
}
return registerConsumer(callback, EventType.ON_CREATURE_SEE, ListenerRegisterType.NPC, npcIds);
}
@@ -854,6 +858,10 @@ public abstract class AbstractScript extends ManagedScript
*/
protected final List<AbstractEventListener> setCreatureSeeId(Consumer<OnCreatureSee> callback, Collection<Integer> npcIds)
{
for (int id : npcIds)
{
Npc.addCreatureSeeId(id);
}
return registerConsumer(callback, EventType.ON_CREATURE_SEE, ListenerRegisterType.NPC, npcIds);
}