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

Add script checks for registering non existent NPC ids.

Browse Source
This commit is contained in:
MobiusDev 2017-08-05 03:36:21 +00:00
parent 59864252c5
commit b689c86193
3 changed files with 336 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
View File

@ -386,6 +386,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setAttackableKillId(Consumer<OnAttackableKill> callback, int... npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addKillId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_ATTACKABLE_KILL, ListenerRegisterType.NPC, npcIds);
}
@ -397,6 +404,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setAttackableKillId(Consumer<OnAttackableKill> callback, Collection<Integer> npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addKillId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_ATTACKABLE_KILL, ListenerRegisterType.NPC, npcIds);
}
@ -480,6 +494,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcFirstTalkId(Consumer<OnNpcFirstTalk> callback, int... npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addFirstTalkId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_NPC_FIRST_TALK, ListenerRegisterType.NPC, npcIds);
}
@ -491,6 +512,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcFirstTalkId(Consumer<OnNpcFirstTalk> callback, Collection<Integer> npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addFirstTalkId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_NPC_FIRST_TALK, ListenerRegisterType.NPC, npcIds);
}
@ -503,6 +531,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcTalkId(Collection<Integer> npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addTalkId for non existing NPC: " + id + "!");
}
}
return registerDummy(EventType.ON_NPC_TALK, ListenerRegisterType.NPC, npcIds);
}
@ -513,6 +548,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcTalkId(int... npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addTalkId for non existing NPC: " + id + "!");
}
}
return registerDummy(EventType.ON_NPC_TALK, ListenerRegisterType.NPC, npcIds);
}
@ -549,6 +591,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcQuestStartId(int... npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addStartNpc for non existing NPC: " + id + "!");
}
}
return registerDummy(EventType.ON_NPC_QUEST_START, ListenerRegisterType.NPC, npcIds);
}
@ -559,6 +608,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcQuestStartId(Collection<Integer> npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addStartNpc for non existing NPC: " + id + "!");
}
}
return registerDummy(EventType.ON_NPC_QUEST_START, ListenerRegisterType.NPC, npcIds);
}
@ -572,6 +628,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcSkillSeeId(Consumer<OnNpcSkillSee> callback, int... npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addSkillSeeId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_NPC_SKILL_SEE, ListenerRegisterType.NPC, npcIds);
}
@ -583,6 +646,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcSkillSeeId(Consumer<OnNpcSkillSee> callback, Collection<Integer> npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addSkillSeeId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_NPC_SKILL_SEE, ListenerRegisterType.NPC, npcIds);
}
@ -596,6 +666,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcSkillFinishedId(Consumer<OnNpcSkillFinished> callback, int... npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addSpellFinishedId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_NPC_SKILL_FINISHED, ListenerRegisterType.NPC, npcIds);
}
@ -607,6 +684,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcSkillFinishedId(Consumer<OnNpcSkillFinished> callback, Collection<Integer> npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addSpellFinishedId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_NPC_SKILL_FINISHED, ListenerRegisterType.NPC, npcIds);
}
@ -620,6 +704,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcSpawnId(Consumer<OnNpcSpawn> callback, int... npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addSpawnId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_NPC_SPAWN, ListenerRegisterType.NPC, npcIds);
}
@ -631,6 +722,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcSpawnId(Consumer<OnNpcSpawn> callback, Collection<Integer> npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addSpawnId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_NPC_SPAWN, ListenerRegisterType.NPC, npcIds);
}
@ -915,6 +1013,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setAttackableAttackId(Consumer<OnAttackableAttack> callback, int... npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addAttackId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_ATTACKABLE_ATTACK, ListenerRegisterType.NPC, npcIds);
}
@ -926,6 +1031,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setAttackableAttackId(Consumer<OnAttackableAttack> callback, Collection<Integer> npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addAttackId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_ATTACKABLE_ATTACK, ListenerRegisterType.NPC, npcIds);
}

112
L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
View File

@ -386,6 +386,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setAttackableKillId(Consumer<OnAttackableKill> callback, int... npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addKillId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_ATTACKABLE_KILL, ListenerRegisterType.NPC, npcIds);
}
@ -397,6 +404,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setAttackableKillId(Consumer<OnAttackableKill> callback, Collection<Integer> npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addKillId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_ATTACKABLE_KILL, ListenerRegisterType.NPC, npcIds);
}
@ -480,6 +494,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcFirstTalkId(Consumer<OnNpcFirstTalk> callback, int... npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addFirstTalkId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_NPC_FIRST_TALK, ListenerRegisterType.NPC, npcIds);
}
@ -491,6 +512,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcFirstTalkId(Consumer<OnNpcFirstTalk> callback, Collection<Integer> npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addFirstTalkId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_NPC_FIRST_TALK, ListenerRegisterType.NPC, npcIds);
}
@ -503,6 +531,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcTalkId(Collection<Integer> npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addTalkId for non existing NPC: " + id + "!");
}
}
return registerDummy(EventType.ON_NPC_TALK, ListenerRegisterType.NPC, npcIds);
}
@ -513,6 +548,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcTalkId(int... npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addTalkId for non existing NPC: " + id + "!");
}
}
return registerDummy(EventType.ON_NPC_TALK, ListenerRegisterType.NPC, npcIds);
}
@ -549,6 +591,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcQuestStartId(int... npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addStartNpc for non existing NPC: " + id + "!");
}
}
return registerDummy(EventType.ON_NPC_QUEST_START, ListenerRegisterType.NPC, npcIds);
}
@ -559,6 +608,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcQuestStartId(Collection<Integer> npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addStartNpc for non existing NPC: " + id + "!");
}
}
return registerDummy(EventType.ON_NPC_QUEST_START, ListenerRegisterType.NPC, npcIds);
}
@ -572,6 +628,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcSkillSeeId(Consumer<OnNpcSkillSee> callback, int... npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addSkillSeeId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_NPC_SKILL_SEE, ListenerRegisterType.NPC, npcIds);
}
@ -583,6 +646,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcSkillSeeId(Consumer<OnNpcSkillSee> callback, Collection<Integer> npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addSkillSeeId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_NPC_SKILL_SEE, ListenerRegisterType.NPC, npcIds);
}
@ -596,6 +666,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcSkillFinishedId(Consumer<OnNpcSkillFinished> callback, int... npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addSpellFinishedId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_NPC_SKILL_FINISHED, ListenerRegisterType.NPC, npcIds);
}
@ -607,6 +684,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcSkillFinishedId(Consumer<OnNpcSkillFinished> callback, Collection<Integer> npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addSpellFinishedId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_NPC_SKILL_FINISHED, ListenerRegisterType.NPC, npcIds);
}
@ -620,6 +704,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcSpawnId(Consumer<OnNpcSpawn> callback, int... npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addSpawnId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_NPC_SPAWN, ListenerRegisterType.NPC, npcIds);
}
@ -631,6 +722,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcSpawnId(Consumer<OnNpcSpawn> callback, Collection<Integer> npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addSpawnId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_NPC_SPAWN, ListenerRegisterType.NPC, npcIds);
}
@ -915,6 +1013,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setAttackableAttackId(Consumer<OnAttackableAttack> callback, int... npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addAttackId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_ATTACKABLE_ATTACK, ListenerRegisterType.NPC, npcIds);
}
@ -926,6 +1031,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setAttackableAttackId(Consumer<OnAttackableAttack> callback, Collection<Integer> npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addAttackId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_ATTACKABLE_ATTACK, ListenerRegisterType.NPC, npcIds);
}

112
L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
View File

@ -386,6 +386,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setAttackableKillId(Consumer<OnAttackableKill> callback, int... npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addKillId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_ATTACKABLE_KILL, ListenerRegisterType.NPC, npcIds);
}
@ -397,6 +404,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setAttackableKillId(Consumer<OnAttackableKill> callback, Collection<Integer> npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addKillId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_ATTACKABLE_KILL, ListenerRegisterType.NPC, npcIds);
}
@ -480,6 +494,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcFirstTalkId(Consumer<OnNpcFirstTalk> callback, int... npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addFirstTalkId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_NPC_FIRST_TALK, ListenerRegisterType.NPC, npcIds);
}
@ -491,6 +512,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcFirstTalkId(Consumer<OnNpcFirstTalk> callback, Collection<Integer> npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addFirstTalkId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_NPC_FIRST_TALK, ListenerRegisterType.NPC, npcIds);
}
@ -503,6 +531,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcTalkId(Collection<Integer> npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addTalkId for non existing NPC: " + id + "!");
}
}
return registerDummy(EventType.ON_NPC_TALK, ListenerRegisterType.NPC, npcIds);
}
@ -513,6 +548,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcTalkId(int... npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addTalkId for non existing NPC: " + id + "!");
}
}
return registerDummy(EventType.ON_NPC_TALK, ListenerRegisterType.NPC, npcIds);
}
@ -549,6 +591,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcQuestStartId(int... npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addStartNpc for non existing NPC: " + id + "!");
}
}
return registerDummy(EventType.ON_NPC_QUEST_START, ListenerRegisterType.NPC, npcIds);
}
@ -559,6 +608,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcQuestStartId(Collection<Integer> npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addStartNpc for non existing NPC: " + id + "!");
}
}
return registerDummy(EventType.ON_NPC_QUEST_START, ListenerRegisterType.NPC, npcIds);
}
@ -572,6 +628,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcSkillSeeId(Consumer<OnNpcSkillSee> callback, int... npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addSkillSeeId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_NPC_SKILL_SEE, ListenerRegisterType.NPC, npcIds);
}
@ -583,6 +646,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcSkillSeeId(Consumer<OnNpcSkillSee> callback, Collection<Integer> npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addSkillSeeId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_NPC_SKILL_SEE, ListenerRegisterType.NPC, npcIds);
}
@ -596,6 +666,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcSkillFinishedId(Consumer<OnNpcSkillFinished> callback, int... npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addSpellFinishedId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_NPC_SKILL_FINISHED, ListenerRegisterType.NPC, npcIds);
}
@ -607,6 +684,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcSkillFinishedId(Consumer<OnNpcSkillFinished> callback, Collection<Integer> npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addSpellFinishedId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_NPC_SKILL_FINISHED, ListenerRegisterType.NPC, npcIds);
}
@ -620,6 +704,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcSpawnId(Consumer<OnNpcSpawn> callback, int... npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addSpawnId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_NPC_SPAWN, ListenerRegisterType.NPC, npcIds);
}
@ -631,6 +722,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setNpcSpawnId(Consumer<OnNpcSpawn> callback, Collection<Integer> npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addSpawnId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_NPC_SPAWN, ListenerRegisterType.NPC, npcIds);
}
@ -915,6 +1013,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setAttackableAttackId(Consumer<OnAttackableAttack> callback, int... npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addAttackId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_ATTACKABLE_ATTACK, ListenerRegisterType.NPC, npcIds);
}
@ -926,6 +1031,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected final List<AbstractEventListener> setAttackableAttackId(Consumer<OnAttackableAttack> callback, Collection<Integer> npcIds)
{
for (int id : npcIds)
{
if (NpcData.getInstance().getTemplate(id) == null)
{
_log.severe(super.getClass().getSimpleName() + ": Found addAttackId for non existing NPC: " + id + "!");
}
}
return registerConsumer(callback, EventType.ON_ATTACKABLE_ATTACK, ListenerRegisterType.NPC, npcIds);
}