Various quest QuestState NPE checks.

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

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)));

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)));

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)));

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

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

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)));

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)));

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)));

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)));

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

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

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)));

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)));

View File

@ -242,7 +242,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)));

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)));

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

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

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)));

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)));

View File

@ -242,7 +242,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)));

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)));

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

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

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)));

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)));

View File

@ -242,7 +242,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)));

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)));

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

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

View File

@ -225,7 +225,7 @@ public final class Q10517_FafurionsMinions 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(551710, true, qs.getInt(KILL_COUNT_VAR))); // Defeat Fafurion's Kin

View File

@ -283,7 +283,7 @@ public final class Q10518_SucceedingThePriestess 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(551810, true, qs.getInt(KILL_COUNT_VAR))); // Defeat Krofins

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)));

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)));

View File

@ -241,7 +241,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)));

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)));

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

View File

@ -225,7 +225,7 @@ public final class Q10517_FafurionsMinions 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(551710, true, qs.getInt(KILL_COUNT_VAR))); // Defeat Fafurion's Kin

View File

@ -283,7 +283,7 @@ public final class Q10518_SucceedingThePriestess 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(551810, true, qs.getInt(KILL_COUNT_VAR))); // Defeat Krofins

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)));

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)));

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)));

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)));

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)));

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)));

View File

@ -451,7 +451,7 @@ public class Q00511_AwlUnderFoot extends Quest
private void rewardPlayer(Player player)
{
final QuestState qs = getQuestState(player, false);
if (qs.isCond(1))
if ((qs != null) && qs.isCond(1))
{
giveItems(player, DL_MARK, 140);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);

View File

@ -451,7 +451,7 @@ public class Q00511_AwlUnderFoot extends Quest
private void rewardPlayer(Player player)
{
final QuestState qs = getQuestState(player, false);
if (qs.isCond(1))
if ((qs != null) && qs.isCond(1))
{
giveItems(player, DL_MARK, 140);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);