Random party member null quest state checks.

This commit is contained in:
MobiusDevelopment 2020-09-18 21:35:55 +00:00
parent 9d1ea96db9
commit f4f20ca9b7
10 changed files with 42 additions and 0 deletions

View File

@ -229,6 +229,11 @@ public class Q039_RedEyedInvaders extends Quest
if ((partyMember != null) && (npcId != MAILLE_LIZARDMAN)) if ((partyMember != null) && (npcId != MAILLE_LIZARDMAN))
{ {
final QuestState st = partyMember.getQuestState(getName()); final QuestState st = partyMember.getQuestState(getName());
if (st == null)
{
return null;
}
final int[] list = SECOND_DP.get(npcId); final int[] list = SECOND_DP.get(npcId);
if (st.dropItems(list[0], 1, 30, list[2]) && (st.getQuestItemsCount(list[1]) == 30)) if (st.dropItems(list[0], 1, 30, list[2]) && (st.getQuestItemsCount(list[1]) == 30))
{ {

View File

@ -228,6 +228,10 @@ public class Q374_WhisperOfDreams_Part1 extends Quest
} }
st = partyMember.getQuestState(getName()); st = partyMember.getQuestState(getName());
if (st == null)
{
return null;
}
if (st.dropItems(SEALED_MYSTERIOUS_STONE, 1, 1, 1000)) if (st.dropItems(SEALED_MYSTERIOUS_STONE, 1, 1, 1000))
{ {

View File

@ -214,6 +214,10 @@ public class Q376_ExplorationOfTheGiantsCave_Part1 extends Quest
} }
st = partyMember.getQuestState(getName()); st = partyMember.getQuestState(getName());
if (st == null)
{
return null;
}
if (st.dropItems(MYSTERIOUS_BOOK, 1, 1, 1000)) if (st.dropItems(MYSTERIOUS_BOOK, 1, 1, 1000))
{ {

View File

@ -353,6 +353,10 @@ public class Q605_AllianceWithKetraOrcs extends Quest
} }
st = partyMember.getQuestState(getName()); st = partyMember.getQuestState(getName());
if (st == null)
{
return null;
}
final int cond = st.getInt("cond"); final int cond = st.getInt("cond");
if (cond == 6) if (cond == 6)

View File

@ -353,6 +353,10 @@ public class Q611_AllianceWithVarkaSilenos extends Quest
} }
st = partyMember.getQuestState(getName()); st = partyMember.getQuestState(getName());
if (st == null)
{
return null;
}
final int cond = st.getInt("cond"); final int cond = st.getInt("cond");
if (cond == 6) if (cond == 6)

View File

@ -229,6 +229,11 @@ public class Q039_RedEyedInvaders extends Quest
if ((partyMember != null) && (npcId != MAILLE_LIZARDMAN)) if ((partyMember != null) && (npcId != MAILLE_LIZARDMAN))
{ {
final QuestState st = partyMember.getQuestState(getName()); final QuestState st = partyMember.getQuestState(getName());
if (st == null)
{
return null;
}
final int[] list = SECOND_DP.get(npcId); final int[] list = SECOND_DP.get(npcId);
if (st.dropItems(list[0], 1, 30, list[2]) && (st.getQuestItemsCount(list[1]) == 30)) if (st.dropItems(list[0], 1, 30, list[2]) && (st.getQuestItemsCount(list[1]) == 30))
{ {

View File

@ -228,6 +228,10 @@ public class Q374_WhisperOfDreams_Part1 extends Quest
} }
st = partyMember.getQuestState(getName()); st = partyMember.getQuestState(getName());
if (st == null)
{
return null;
}
if (st.dropItems(SEALED_MYSTERIOUS_STONE, 1, 1, 1000)) if (st.dropItems(SEALED_MYSTERIOUS_STONE, 1, 1, 1000))
{ {

View File

@ -214,6 +214,10 @@ public class Q376_ExplorationOfTheGiantsCave_Part1 extends Quest
} }
st = partyMember.getQuestState(getName()); st = partyMember.getQuestState(getName());
if (st == null)
{
return null;
}
if (st.dropItems(MYSTERIOUS_BOOK, 1, 1, 1000)) if (st.dropItems(MYSTERIOUS_BOOK, 1, 1, 1000))
{ {

View File

@ -353,6 +353,10 @@ public class Q605_AllianceWithKetraOrcs extends Quest
} }
st = partyMember.getQuestState(getName()); st = partyMember.getQuestState(getName());
if (st == null)
{
return null;
}
final int cond = st.getInt("cond"); final int cond = st.getInt("cond");
if (cond == 6) if (cond == 6)

View File

@ -353,6 +353,10 @@ public class Q611_AllianceWithVarkaSilenos extends Quest
} }
st = partyMember.getQuestState(getName()); st = partyMember.getQuestState(getName());
if (st == null)
{
return null;
}
final int cond = st.getInt("cond"); final int cond = st.getInt("cond");
if (cond == 6) if (cond == 6)