diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java b/L2J_Mobius_HighFive/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java index c54e967f72..171e458087 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java @@ -41,7 +41,7 @@ public final class RaidbossInfo extends Quest { 31729, 31730, 31731, 31732, 31733, 31734, 31735, 31736, 31737, 31738, 31739, 31740, 31741, 31742, 31743, 31744, 31745, 31746, 31747, 31748, - 31749, 31750, 31751, 31752, 31753, 31754, 31755, 31756, 31757, 31758, + 31750, 31751, 31752, 31755, 31756, 31757, 31758, 31759, 31760, 31761, 31762, 31763, 31764, 31765, 31766, 31767, 31768, 31769, 31770, 31771, 31772, 31773, 31774, 31775, 31776, 31777, 31778, 31779, 31780, 31781, 31782, 31783, 31784, 31785, 31786, 31787, 31788, diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java index e18ea54519..0af8b4ea82 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java @@ -92,8 +92,8 @@ public final class DarkCloudMansion extends AbstractInstance 18375, 18376, 18377, - 22318, - 22319, + // 22318, + // 22319, 22272, 22273, 22274, diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/events/AbstractScript.java index 6450b74e05..396f35c1eb 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/events/AbstractScript.java @@ -308,6 +308,13 @@ public abstract class AbstractScript extends ManagedScript */ protected final List setAttackableKillId(Consumer 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 setAttackableKillId(Consumer callback, Collection 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 setNpcFirstTalkId(Consumer 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 setNpcFirstTalkId(Consumer callback, Collection 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 setNpcTalkId(Collection 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 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 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 setNpcQuestStartId(Collection 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 setNpcSkillSeeId(Consumer 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 setNpcSkillSeeId(Consumer callback, Collection 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 setNpcSkillFinishedId(Consumer 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 setNpcSkillFinishedId(Consumer callback, Collection 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 setNpcSpawnId(Consumer 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 setNpcSpawnId(Consumer callback, Collection 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 setAttackableAttackId(Consumer 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 setAttackableAttackId(Consumer callback, Collection 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(); } /** diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/quest/Quest.java index 721d57ecec..a98d654ddc 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/quest/Quest.java @@ -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; }