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

Script checks for HighFive.

Browse Source
This commit is contained in:
MobiusDev
2017-08-05 14:12:37 +00:00
parent 077ef0bbe3
commit 99e5433deb
4 changed files with 126 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
View File

@@ -308,6 +308,13 @@ public abstract class AbstractScript extends ManagedScript
*/
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);
}
@@ -319,6 +326,13 @@ public abstract class AbstractScript extends ManagedScript
*/
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);
}
@@ -367,6 +381,13 @@ public abstract class AbstractScript extends ManagedScript
*/
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);
}
@@ -378,6 +399,13 @@ public abstract class AbstractScript extends ManagedScript
*/
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);
}
@@ -390,6 +418,13 @@ public abstract class AbstractScript extends ManagedScript
*/
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);
}
@@ -400,6 +435,13 @@ public abstract class AbstractScript extends ManagedScript
*/
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);
}
@@ -436,6 +478,13 @@ public abstract class AbstractScript extends ManagedScript
*/
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);
}
@@ -446,6 +495,13 @@ public abstract class AbstractScript extends ManagedScript
*/
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);
}
@@ -459,6 +515,13 @@ public abstract class AbstractScript extends ManagedScript
*/
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);
}
@@ -470,6 +533,13 @@ public abstract class AbstractScript extends ManagedScript
*/
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);
}
@@ -483,6 +553,13 @@ public abstract class AbstractScript extends ManagedScript
*/
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);
}
@@ -494,6 +571,13 @@ public abstract class AbstractScript extends ManagedScript
*/
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);
}
@@ -507,6 +591,13 @@ public abstract class AbstractScript extends ManagedScript
*/
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);
}
@@ -518,6 +609,13 @@ public abstract class AbstractScript extends ManagedScript
*/
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);
}
@@ -767,6 +865,13 @@ public abstract class AbstractScript extends ManagedScript
*/
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);
}
@@ -778,6 +883,13 @@ public abstract class AbstractScript extends ManagedScript
*/
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);
}
@@ -1972,11 +2084,11 @@ public abstract class AbstractScript extends ManagedScript
public static int getEnchantLevel(L2PcInstance player, int itemId)
{
final L2ItemInstance enchantedItem = player.getInventory().getItemByItemId(itemId);
if (enchantedItem != null)
if (enchantedItem == null)
{
return enchantedItem.getEnchantLevel();
return 0;
}
return 0;
return enchantedItem.getEnchantLevel();
}
/**

8
L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/quest/Quest.java
View File

@@ -35,6 +35,7 @@ import java.util.logging.Level;
import com.l2jmobius.Config;
import com.l2jmobius.commons.database.DatabaseFactory;
import com.l2jmobius.gameserver.cache.HtmCache;
import com.l2jmobius.gameserver.datatables.ItemTable;
import com.l2jmobius.gameserver.enums.CategoryType;
import com.l2jmobius.gameserver.enums.Race;
import com.l2jmobius.gameserver.enums.TrapAction;
@@ -2589,6 +2590,13 @@ public class Quest extends AbstractScript implements IIdentifiable
*/
public void registerQuestItems(int... items)
{
for (int id : items)
{
if ((id != 0) && (ItemTable.getInstance().getTemplate(id) == null))
{
_log.severe(super.getClass().getSimpleName() + ": Found registerQuestItems for non existing item: " + id + "!");
}
}
questItemIds = items;
}