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

CeremonyOfChaosEvent quest related NPE checks.

Browse Source
This commit is contained in:
MobiusDevelopment 2020-11-13 23:33:39 +00:00
parent c61ea3f137
commit 49f9d45238
7 changed files with 95 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java
View File

@ -416,22 +416,27 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
// XXX: ML2 Rewards ForGlory, ForHonor and ForVictory quests // XXX: ML2 Rewards ForGlory, ForHonor and ForVictory quests
for (CeremonyOfChaosMember member : getMembers().values()) for (CeremonyOfChaosMember member : getMembers().values())
{ {
final QuestState qs = member.getPlayer().getQuestState("Q10813_ForGlory"); final PlayerInstance player = member.getPlayer();
final QuestState qs1 = member.getPlayer().getQuestState("Q10819_ForHonor"); if (player == null)
{
continue;
}
final QuestState qs = player.getQuestState("Q10813_ForGlory");
final QuestState qs1 = player.getQuestState("Q10819_ForHonor");
if ((qs != null) && !qs.isCompleted() && qs.isCond(1)) if ((qs != null) && !qs.isCompleted() && qs.isCond(1))
{ {
AbstractScript.giveItems(member.getPlayer(), Config.EXALTED_FOR_GLORY_ITEM_MAX.getId(), 1); AbstractScript.giveItems(player, Config.EXALTED_FOR_GLORY_ITEM_MAX.getId(), 1);
AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); AbstractScript.playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
if (AbstractScript.getQuestItemsCount(member.getPlayer(), Config.EXALTED_FOR_GLORY_ITEM_MAX.getId()) >= Config.EXALTED_FOR_GLORY_ITEM_MAX.getCount()) if (AbstractScript.getQuestItemsCount(player, Config.EXALTED_FOR_GLORY_ITEM_MAX.getId()) >= Config.EXALTED_FOR_GLORY_ITEM_MAX.getCount())
{ {
qs.setCond(2, true); qs.setCond(2, true);
} }
} }
else if ((qs1 != null) && !qs1.isCompleted() && qs1.isCond(1)) else if ((qs1 != null) && !qs1.isCompleted() && qs1.isCond(1))
{ {
AbstractScript.giveItems(member.getPlayer(), Config.EXALTED_FOR_HONOR_ITEM_MAX.getId(), 1); AbstractScript.giveItems(player, Config.EXALTED_FOR_HONOR_ITEM_MAX.getId(), 1);
AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); AbstractScript.playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
if (AbstractScript.getQuestItemsCount(member.getPlayer(), Config.EXALTED_FOR_HONOR_ITEM_MAX.getId()) >= Config.EXALTED_FOR_HONOR_ITEM_MAX.getCount()) if (AbstractScript.getQuestItemsCount(player, Config.EXALTED_FOR_HONOR_ITEM_MAX.getId()) >= Config.EXALTED_FOR_HONOR_ITEM_MAX.getCount())
{ {
qs1.setCond(2, true); qs1.setCond(2, true);
} }

21
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java
View File

@ -416,22 +416,27 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
// XXX: ML2 Rewards ForGlory, ForHonor and ForVictory quests // XXX: ML2 Rewards ForGlory, ForHonor and ForVictory quests
for (CeremonyOfChaosMember member : getMembers().values()) for (CeremonyOfChaosMember member : getMembers().values())
{ {
final QuestState qs = member.getPlayer().getQuestState("Q10813_ForGlory"); final PlayerInstance player = member.getPlayer();
final QuestState qs1 = member.getPlayer().getQuestState("Q10819_ForHonor"); if (player == null)
{
continue;
}
final QuestState qs = player.getQuestState("Q10813_ForGlory");
final QuestState qs1 = player.getQuestState("Q10819_ForHonor");
if ((qs != null) && !qs.isCompleted() && qs.isCond(1)) if ((qs != null) && !qs.isCompleted() && qs.isCond(1))
{ {
AbstractScript.giveItems(member.getPlayer(), Config.EXALTED_FOR_GLORY_ITEM_MAX.getId(), 1); AbstractScript.giveItems(player, Config.EXALTED_FOR_GLORY_ITEM_MAX.getId(), 1);
AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); AbstractScript.playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
if (AbstractScript.getQuestItemsCount(member.getPlayer(), Config.EXALTED_FOR_GLORY_ITEM_MAX.getId()) >= Config.EXALTED_FOR_GLORY_ITEM_MAX.getCount()) if (AbstractScript.getQuestItemsCount(player, Config.EXALTED_FOR_GLORY_ITEM_MAX.getId()) >= Config.EXALTED_FOR_GLORY_ITEM_MAX.getCount())
{ {
qs.setCond(2, true); qs.setCond(2, true);
} }
} }
else if ((qs1 != null) && !qs1.isCompleted() && qs1.isCond(1)) else if ((qs1 != null) && !qs1.isCompleted() && qs1.isCond(1))
{ {
AbstractScript.giveItems(member.getPlayer(), Config.EXALTED_FOR_HONOR_ITEM_MAX.getId(), 1); AbstractScript.giveItems(player, Config.EXALTED_FOR_HONOR_ITEM_MAX.getId(), 1);
AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); AbstractScript.playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
if (AbstractScript.getQuestItemsCount(member.getPlayer(), Config.EXALTED_FOR_HONOR_ITEM_MAX.getId()) >= Config.EXALTED_FOR_HONOR_ITEM_MAX.getCount()) if (AbstractScript.getQuestItemsCount(player, Config.EXALTED_FOR_HONOR_ITEM_MAX.getId()) >= Config.EXALTED_FOR_HONOR_ITEM_MAX.getCount())
{ {
qs1.setCond(2, true); qs1.setCond(2, true);
} }

21
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java
View File

@ -416,22 +416,27 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
// XXX: ML2 Rewards ForGlory, ForHonor and ForVictory quests // XXX: ML2 Rewards ForGlory, ForHonor and ForVictory quests
for (CeremonyOfChaosMember member : getMembers().values()) for (CeremonyOfChaosMember member : getMembers().values())
{ {
final QuestState qs = member.getPlayer().getQuestState("Q10813_ForGlory"); final PlayerInstance player = member.getPlayer();
final QuestState qs1 = member.getPlayer().getQuestState("Q10819_ForHonor"); if (player == null)
{
continue;
}
final QuestState qs = player.getQuestState("Q10813_ForGlory");
final QuestState qs1 = player.getQuestState("Q10819_ForHonor");
if ((qs != null) && !qs.isCompleted() && qs.isCond(1)) if ((qs != null) && !qs.isCompleted() && qs.isCond(1))
{ {
AbstractScript.giveItems(member.getPlayer(), Config.EXALTED_FOR_GLORY_ITEM_MAX.getId(), 1); AbstractScript.giveItems(player, Config.EXALTED_FOR_GLORY_ITEM_MAX.getId(), 1);
AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); AbstractScript.playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
if (AbstractScript.getQuestItemsCount(member.getPlayer(), Config.EXALTED_FOR_GLORY_ITEM_MAX.getId()) >= Config.EXALTED_FOR_GLORY_ITEM_MAX.getCount()) if (AbstractScript.getQuestItemsCount(player, Config.EXALTED_FOR_GLORY_ITEM_MAX.getId()) >= Config.EXALTED_FOR_GLORY_ITEM_MAX.getCount())
{ {
qs.setCond(2, true); qs.setCond(2, true);
} }
} }
else if ((qs1 != null) && !qs1.isCompleted() && qs1.isCond(1)) else if ((qs1 != null) && !qs1.isCompleted() && qs1.isCond(1))
{ {
AbstractScript.giveItems(member.getPlayer(), Config.EXALTED_FOR_HONOR_ITEM_MAX.getId(), 1); AbstractScript.giveItems(player, Config.EXALTED_FOR_HONOR_ITEM_MAX.getId(), 1);
AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); AbstractScript.playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
if (AbstractScript.getQuestItemsCount(member.getPlayer(), Config.EXALTED_FOR_HONOR_ITEM_MAX.getId()) >= Config.EXALTED_FOR_HONOR_ITEM_MAX.getCount()) if (AbstractScript.getQuestItemsCount(player, Config.EXALTED_FOR_HONOR_ITEM_MAX.getId()) >= Config.EXALTED_FOR_HONOR_ITEM_MAX.getCount())
{ {
qs1.setCond(2, true); qs1.setCond(2, true);
} }

21
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java
View File

@ -416,22 +416,27 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
// XXX: ML2 Rewards ForGlory, ForHonor and ForVictory quests // XXX: ML2 Rewards ForGlory, ForHonor and ForVictory quests
for (CeremonyOfChaosMember member : getMembers().values()) for (CeremonyOfChaosMember member : getMembers().values())
{ {
final QuestState qs = member.getPlayer().getQuestState("Q10813_ForGlory"); final PlayerInstance player = member.getPlayer();
final QuestState qs1 = member.getPlayer().getQuestState("Q10819_ForHonor"); if (player == null)
{
continue;
}
final QuestState qs = player.getQuestState("Q10813_ForGlory");
final QuestState qs1 = player.getQuestState("Q10819_ForHonor");
if ((qs != null) && !qs.isCompleted() && qs.isCond(1)) if ((qs != null) && !qs.isCompleted() && qs.isCond(1))
{ {
AbstractScript.giveItems(member.getPlayer(), Config.EXALTED_FOR_GLORY_ITEM_MAX.getId(), 1); AbstractScript.giveItems(player, Config.EXALTED_FOR_GLORY_ITEM_MAX.getId(), 1);
AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); AbstractScript.playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
if (AbstractScript.getQuestItemsCount(member.getPlayer(), Config.EXALTED_FOR_GLORY_ITEM_MAX.getId()) >= Config.EXALTED_FOR_GLORY_ITEM_MAX.getCount()) if (AbstractScript.getQuestItemsCount(player, Config.EXALTED_FOR_GLORY_ITEM_MAX.getId()) >= Config.EXALTED_FOR_GLORY_ITEM_MAX.getCount())
{ {
qs.setCond(2, true); qs.setCond(2, true);
} }
} }
else if ((qs1 != null) && !qs1.isCompleted() && qs1.isCond(1)) else if ((qs1 != null) && !qs1.isCompleted() && qs1.isCond(1))
{ {
AbstractScript.giveItems(member.getPlayer(), Config.EXALTED_FOR_HONOR_ITEM_MAX.getId(), 1); AbstractScript.giveItems(player, Config.EXALTED_FOR_HONOR_ITEM_MAX.getId(), 1);
AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); AbstractScript.playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
if (AbstractScript.getQuestItemsCount(member.getPlayer(), Config.EXALTED_FOR_HONOR_ITEM_MAX.getId()) >= Config.EXALTED_FOR_HONOR_ITEM_MAX.getCount()) if (AbstractScript.getQuestItemsCount(player, Config.EXALTED_FOR_HONOR_ITEM_MAX.getId()) >= Config.EXALTED_FOR_HONOR_ITEM_MAX.getCount())
{ {
qs1.setCond(2, true); qs1.setCond(2, true);
} }

21
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java
View File

@ -416,22 +416,27 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
// XXX: ML2 Rewards ForGlory, ForHonor and ForVictory quests // XXX: ML2 Rewards ForGlory, ForHonor and ForVictory quests
for (CeremonyOfChaosMember member : getMembers().values()) for (CeremonyOfChaosMember member : getMembers().values())
{ {
final QuestState qs = member.getPlayer().getQuestState("Q10813_ForGlory"); final PlayerInstance player = member.getPlayer();
final QuestState qs1 = member.getPlayer().getQuestState("Q10819_ForHonor"); if (player == null)
{
continue;
}
final QuestState qs = player.getQuestState("Q10813_ForGlory");
final QuestState qs1 = player.getQuestState("Q10819_ForHonor");
if ((qs != null) && !qs.isCompleted() && qs.isCond(1)) if ((qs != null) && !qs.isCompleted() && qs.isCond(1))
{ {
AbstractScript.giveItems(member.getPlayer(), Config.EXALTED_FOR_GLORY_ITEM_MAX.getId(), 1); AbstractScript.giveItems(player, Config.EXALTED_FOR_GLORY_ITEM_MAX.getId(), 1);
AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); AbstractScript.playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
if (AbstractScript.getQuestItemsCount(member.getPlayer(), Config.EXALTED_FOR_GLORY_ITEM_MAX.getId()) >= Config.EXALTED_FOR_GLORY_ITEM_MAX.getCount()) if (AbstractScript.getQuestItemsCount(player, Config.EXALTED_FOR_GLORY_ITEM_MAX.getId()) >= Config.EXALTED_FOR_GLORY_ITEM_MAX.getCount())
{ {
qs.setCond(2, true); qs.setCond(2, true);
} }
} }
else if ((qs1 != null) && !qs1.isCompleted() && qs1.isCond(1)) else if ((qs1 != null) && !qs1.isCompleted() && qs1.isCond(1))
{ {
AbstractScript.giveItems(member.getPlayer(), Config.EXALTED_FOR_HONOR_ITEM_MAX.getId(), 1); AbstractScript.giveItems(player, Config.EXALTED_FOR_HONOR_ITEM_MAX.getId(), 1);
AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); AbstractScript.playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
if (AbstractScript.getQuestItemsCount(member.getPlayer(), Config.EXALTED_FOR_HONOR_ITEM_MAX.getId()) >= Config.EXALTED_FOR_HONOR_ITEM_MAX.getCount()) if (AbstractScript.getQuestItemsCount(player, Config.EXALTED_FOR_HONOR_ITEM_MAX.getId()) >= Config.EXALTED_FOR_HONOR_ITEM_MAX.getCount())
{ {
qs1.setCond(2, true); qs1.setCond(2, true);
} }

21
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java
View File

@ -416,22 +416,27 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
// XXX: ML2 Rewards ForGlory, ForHonor and ForVictory quests // XXX: ML2 Rewards ForGlory, ForHonor and ForVictory quests
for (CeremonyOfChaosMember member : getMembers().values()) for (CeremonyOfChaosMember member : getMembers().values())
{ {
final QuestState qs = member.getPlayer().getQuestState("Q10813_ForGlory"); final PlayerInstance player = member.getPlayer();
final QuestState qs1 = member.getPlayer().getQuestState("Q10819_ForHonor"); if (player == null)
{
continue;
}
final QuestState qs = player.getQuestState("Q10813_ForGlory");
final QuestState qs1 = player.getQuestState("Q10819_ForHonor");
if ((qs != null) && !qs.isCompleted() && qs.isCond(1)) if ((qs != null) && !qs.isCompleted() && qs.isCond(1))
{ {
AbstractScript.giveItems(member.getPlayer(), Config.EXALTED_FOR_GLORY_ITEM_MAX.getId(), 1); AbstractScript.giveItems(player, Config.EXALTED_FOR_GLORY_ITEM_MAX.getId(), 1);
AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); AbstractScript.playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
if (AbstractScript.getQuestItemsCount(member.getPlayer(), Config.EXALTED_FOR_GLORY_ITEM_MAX.getId()) >= Config.EXALTED_FOR_GLORY_ITEM_MAX.getCount()) if (AbstractScript.getQuestItemsCount(player, Config.EXALTED_FOR_GLORY_ITEM_MAX.getId()) >= Config.EXALTED_FOR_GLORY_ITEM_MAX.getCount())
{ {
qs.setCond(2, true); qs.setCond(2, true);
} }
} }
else if ((qs1 != null) && !qs1.isCompleted() && qs1.isCond(1)) else if ((qs1 != null) && !qs1.isCompleted() && qs1.isCond(1))
{ {
AbstractScript.giveItems(member.getPlayer(), Config.EXALTED_FOR_HONOR_ITEM_MAX.getId(), 1); AbstractScript.giveItems(player, Config.EXALTED_FOR_HONOR_ITEM_MAX.getId(), 1);
AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); AbstractScript.playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
if (AbstractScript.getQuestItemsCount(member.getPlayer(), Config.EXALTED_FOR_HONOR_ITEM_MAX.getId()) >= Config.EXALTED_FOR_HONOR_ITEM_MAX.getCount()) if (AbstractScript.getQuestItemsCount(player, Config.EXALTED_FOR_HONOR_ITEM_MAX.getId()) >= Config.EXALTED_FOR_HONOR_ITEM_MAX.getCount())
{ {
qs1.setCond(2, true); qs1.setCond(2, true);
} }

29
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java
View File

@ -416,32 +416,37 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
// XXX: ML2 Rewards ForGlory, ForHonor and ForVictory quests // XXX: ML2 Rewards ForGlory, ForHonor and ForVictory quests
for (CeremonyOfChaosMember member : getMembers().values()) for (CeremonyOfChaosMember member : getMembers().values())
{ {
final QuestState qs = member.getPlayer().getQuestState("Q10813_ForGlory"); final PlayerInstance player = member.getPlayer();
final QuestState qs1 = member.getPlayer().getQuestState("Q10819_ForHonor"); if (player == null)
final QuestState qs2 = member.getPlayer().getQuestState("Q10825_ForVictory"); {
continue;
}
final QuestState qs = player.getQuestState("Q10813_ForGlory");
final QuestState qs1 = player.getQuestState("Q10819_ForHonor");
final QuestState qs2 = player.getQuestState("Q10825_ForVictory");
if ((qs != null) && !qs.isCompleted() && qs.isCond(1)) if ((qs != null) && !qs.isCompleted() && qs.isCond(1))
{ {
AbstractScript.giveItems(member.getPlayer(), Config.EXALTED_FOR_GLORY_ITEM_MAX.getId(), 1); AbstractScript.giveItems(player, Config.EXALTED_FOR_GLORY_ITEM_MAX.getId(), 1);
AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); AbstractScript.playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
if (AbstractScript.getQuestItemsCount(member.getPlayer(), Config.EXALTED_FOR_GLORY_ITEM_MAX.getId()) >= Config.EXALTED_FOR_GLORY_ITEM_MAX.getCount()) if (AbstractScript.getQuestItemsCount(player, Config.EXALTED_FOR_GLORY_ITEM_MAX.getId()) >= Config.EXALTED_FOR_GLORY_ITEM_MAX.getCount())
{ {
qs.setCond(2, true); qs.setCond(2, true);
} }
} }
else if ((qs1 != null) && !qs1.isCompleted() && qs1.isCond(1)) else if ((qs1 != null) && !qs1.isCompleted() && qs1.isCond(1))
{ {
AbstractScript.giveItems(member.getPlayer(), Config.EXALTED_FOR_HONOR_ITEM_MAX.getId(), 1); AbstractScript.giveItems(player, Config.EXALTED_FOR_HONOR_ITEM_MAX.getId(), 1);
AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); AbstractScript.playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
if (AbstractScript.getQuestItemsCount(member.getPlayer(), Config.EXALTED_FOR_HONOR_ITEM_MAX.getId()) >= Config.EXALTED_FOR_HONOR_ITEM_MAX.getCount()) if (AbstractScript.getQuestItemsCount(player, Config.EXALTED_FOR_HONOR_ITEM_MAX.getId()) >= Config.EXALTED_FOR_HONOR_ITEM_MAX.getCount())
{ {
qs1.setCond(2, true); qs1.setCond(2, true);
} }
} }
else if ((qs2 != null) && !qs2.isCompleted() && qs2.isCond(3)) else if ((qs2 != null) && !qs2.isCompleted() && qs2.isCond(3))
{ {
AbstractScript.giveItems(member.getPlayer(), Config.EXALTED_FOR_VICTORY_ITEM_MAX.getId(), 1); AbstractScript.giveItems(player, Config.EXALTED_FOR_VICTORY_ITEM_MAX.getId(), 1);
AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); AbstractScript.playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
if (AbstractScript.getQuestItemsCount(member.getPlayer(), Config.EXALTED_FOR_VICTORY_ITEM_MAX.getId()) >= Config.EXALTED_FOR_VICTORY_ITEM_MAX.getCount()) if (AbstractScript.getQuestItemsCount(player, Config.EXALTED_FOR_VICTORY_ITEM_MAX.getId()) >= Config.EXALTED_FOR_VICTORY_ITEM_MAX.getCount())
{ {
qs2.setCond(4, true); qs2.setCond(4, true);
} }