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

Various quest QuestState NPE checks.

Browse Source
This commit is contained in:
MobiusDevelopment
2024-12-07 21:38:15 +02:00
parent f0c5c62ba7
commit 8ed5655d5a
46 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00773_ToCalmTheFlood/Q00773_ToCalmTheFlood.java vendored
View File

@@ -238,7 +238,7 @@ public class Q00773_ToCalmTheFlood extends Quest
public Set<NpcLogListHolder> getNpcLogList(Player player)
{
final QuestState qs = getQuestState(player, false);
if (qs.isCond(1))
if ((qs != null) && qs.isCond(1))
{
final Set<NpcLogListHolder> holder = new HashSet<>();
holder.add(new NpcLogListHolder(ID_FAIRY, false, qs.getInt("killed_" + ID_FAIRY)));

2
L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java vendored
View File

@@ -212,7 +212,7 @@ public class Q00833_DevilsTreasureTauti extends Quest
public Set<NpcLogListHolder> getNpcLogList(Player player)
{
final QuestState qs = getQuestState(player, false);
if (qs.isCond(1) || qs.isCond(4))
if ((qs != null) && (qs.isCond(1) || qs.isCond(4)))
{
final Set<NpcLogListHolder> holder = new HashSet<>(2);
holder.add(new NpcLogListHolder(FLAME_SCORPION, false, qs.getInt("killed_" + FLAME_SCORPION)));

2
L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00841_ContaminationContainment/Q00841_ContaminationContainment.java vendored
View File

@@ -556,7 +556,7 @@ public final class Q00841_ContaminationContainment extends Quest
public Set<NpcLogListHolder> getNpcLogList(Player player)
{
final QuestState qs = getQuestState(player, false);
if (qs.isCond(1))
if ((qs != null) && qs.isCond(1))
{
final Set<NpcLogListHolder> holder = new HashSet<>();
holder.add(new NpcLogListHolder(NpcStringId.DEFEAT_THE_ENRAGED_NYMPH, qs.getInt("killed_Nymphs"))); // Defeat the Enraged Nymph

2
L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00846_BuildingUpStrength/Q00846_BuildingUpStrength.java vendored
View File

@@ -639,7 +639,7 @@ public final class Q00846_BuildingUpStrength extends Quest
public Set<NpcLogListHolder> getNpcLogList(Player player)
{
final QuestState qs = getQuestState(player, false);
if (qs.isCond(2) || qs.isCond(3) || qs.isCond(4))
if ((qs != null) && (qs.isCond(2) || qs.isCond(3) || qs.isCond(4)))
{
final Set<NpcLogListHolder> holder = new HashSet<>();
holder.add(new NpcLogListHolder(84605, true, qs.getInt("captiveMiner"))); // Rescue the Captive Miners

2
L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10522_TheDarkSecretOfVarkaSilenos/Q10522_TheDarkSecretOfVarkaSilenos.java vendored
View File

@@ -215,7 +215,7 @@ public class Q10522_TheDarkSecretOfVarkaSilenos extends Quest
public Set<NpcLogListHolder> getNpcLogList(Player player)
{
final QuestState qs = getQuestState(player, false);
if (qs.isCond(1))
if ((qs != null) && qs.isCond(1))
{
final Set<NpcLogListHolder> holder = new HashSet<>(2);
holder.add(new NpcLogListHolder(VARKA_BACKUP_SHOOTER, false, qs.getInt("killed_" + VARKA_BACKUP_SHOOTER)));

2
L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10854_ToSeizeTheFortress/Q10854_ToSeizeTheFortress.java vendored
View File

@@ -384,7 +384,7 @@ public final class Q10854_ToSeizeTheFortress extends Quest
public Set<NpcLogListHolder> getNpcLogList(Player player)
{
final QuestState qs = getQuestState(player, false);
if (qs.isCond(2))
if ((qs != null) && qs.isCond(2))
{
final Set<NpcLogListHolder> holder = new HashSet<>();
holder.add(new NpcLogListHolder(GEORK, false, qs.getInt("killed_" + GEORK)));