Various quest QuestState NPE checks.
This commit is contained in:
		| @@ -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))); | ||||
|   | ||||
| @@ -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))); | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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))); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 MobiusDevelopment
					MobiusDevelopment