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

NPE checks for Ceremony of Chaos.

Browse Source
This commit is contained in:
MobiusDevelopment 2019-05-24 08:40:58 +00:00
parent 8f1c260c79
commit 80ea69c1ac
7 changed files with 595 additions and 553 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java
View File

@ -282,7 +282,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
final List<CeremonyOfChaosMember> winners = getWinners(); final List<CeremonyOfChaosMember> winners = getWinners();
final List<CeremonyOfChaosMember> members = new ArrayList<>(getMembers().size()); final List<CeremonyOfChaosMember> members = new ArrayList<>(getMembers().size());
final SystemMessage msg; SystemMessage msg = null;
if (winners.isEmpty() || (winners.size() > 1)) if (winners.isEmpty() || (winners.size() > 1))
{ {
msg = SystemMessage.getSystemMessage(SystemMessageId.THERE_IS_NO_VICTOR_THE_MATCH_ENDS_IN_A_TIE); msg = SystemMessage.getSystemMessage(SystemMessageId.THERE_IS_NO_VICTOR_THE_MATCH_ENDS_IN_A_TIE);
@ -290,6 +290,8 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
else else
{ {
final PlayerInstance winner = winners.get(0).getPlayer(); final PlayerInstance winner = winners.get(0).getPlayer();
if (winner != null)
{
msg = SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_C1_YOU_WIN_THE_MATCH); msg = SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_C1_YOU_WIN_THE_MATCH);
msg.addString(winner.getName()); msg.addString(winner.getName());
@ -378,6 +380,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
GlobalVariablesManager.getInstance().set(GlobalVariablesManager.COC_TOP_MEMBER, winner.getObjectId()); GlobalVariablesManager.getInstance().set(GlobalVariablesManager.COC_TOP_MEMBER, winner.getObjectId());
} }
} }
}
for (CeremonyOfChaosMember member : getMembers().values()) for (CeremonyOfChaosMember member : getMembers().values())
{ {
@ -385,7 +388,10 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
if (player != null) if (player != null)
{ {
// Send winner message // Send winner message
if (msg != null)
{
player.sendPacket(msg); player.sendPacket(msg);
}
// Send result // Send result
player.sendPacket(new ExCuriousHouseResult(member.getResultType(), this)); player.sendPacket(new ExCuriousHouseResult(member.getResultType(), this));

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

@ -282,7 +282,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
final List<CeremonyOfChaosMember> winners = getWinners(); final List<CeremonyOfChaosMember> winners = getWinners();
final List<CeremonyOfChaosMember> members = new ArrayList<>(getMembers().size()); final List<CeremonyOfChaosMember> members = new ArrayList<>(getMembers().size());
final SystemMessage msg; SystemMessage msg = null;
if (winners.isEmpty() || (winners.size() > 1)) if (winners.isEmpty() || (winners.size() > 1))
{ {
msg = SystemMessage.getSystemMessage(SystemMessageId.THERE_IS_NO_VICTOR_THE_MATCH_ENDS_IN_A_TIE); msg = SystemMessage.getSystemMessage(SystemMessageId.THERE_IS_NO_VICTOR_THE_MATCH_ENDS_IN_A_TIE);
@ -290,6 +290,8 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
else else
{ {
final PlayerInstance winner = winners.get(0).getPlayer(); final PlayerInstance winner = winners.get(0).getPlayer();
if (winner != null)
{
msg = SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_C1_YOU_WIN_THE_MATCH); msg = SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_C1_YOU_WIN_THE_MATCH);
msg.addString(winner.getName()); msg.addString(winner.getName());
@ -378,6 +380,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
GlobalVariablesManager.getInstance().set(GlobalVariablesManager.COC_TOP_MEMBER, winner.getObjectId()); GlobalVariablesManager.getInstance().set(GlobalVariablesManager.COC_TOP_MEMBER, winner.getObjectId());
} }
} }
}
for (CeremonyOfChaosMember member : getMembers().values()) for (CeremonyOfChaosMember member : getMembers().values())
{ {
@ -385,7 +388,10 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
if (player != null) if (player != null)
{ {
// Send winner message // Send winner message
if (msg != null)
{
player.sendPacket(msg); player.sendPacket(msg);
}
// Send result // Send result
player.sendPacket(new ExCuriousHouseResult(member.getResultType(), this)); player.sendPacket(new ExCuriousHouseResult(member.getResultType(), this));

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

@ -282,7 +282,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
final List<CeremonyOfChaosMember> winners = getWinners(); final List<CeremonyOfChaosMember> winners = getWinners();
final List<CeremonyOfChaosMember> members = new ArrayList<>(getMembers().size()); final List<CeremonyOfChaosMember> members = new ArrayList<>(getMembers().size());
final SystemMessage msg; SystemMessage msg = null;
if (winners.isEmpty() || (winners.size() > 1)) if (winners.isEmpty() || (winners.size() > 1))
{ {
msg = SystemMessage.getSystemMessage(SystemMessageId.THERE_IS_NO_VICTOR_THE_MATCH_ENDS_IN_A_TIE); msg = SystemMessage.getSystemMessage(SystemMessageId.THERE_IS_NO_VICTOR_THE_MATCH_ENDS_IN_A_TIE);
@ -290,6 +290,8 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
else else
{ {
final PlayerInstance winner = winners.get(0).getPlayer(); final PlayerInstance winner = winners.get(0).getPlayer();
if (winner != null)
{
msg = SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_C1_YOU_WIN_THE_MATCH); msg = SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_C1_YOU_WIN_THE_MATCH);
msg.addString(winner.getName()); msg.addString(winner.getName());
@ -378,6 +380,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
GlobalVariablesManager.getInstance().set(GlobalVariablesManager.COC_TOP_MEMBER, winner.getObjectId()); GlobalVariablesManager.getInstance().set(GlobalVariablesManager.COC_TOP_MEMBER, winner.getObjectId());
} }
} }
}
for (CeremonyOfChaosMember member : getMembers().values()) for (CeremonyOfChaosMember member : getMembers().values())
{ {
@ -385,7 +388,10 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
if (player != null) if (player != null)
{ {
// Send winner message // Send winner message
if (msg != null)
{
player.sendPacket(msg); player.sendPacket(msg);
}
// Send result // Send result
player.sendPacket(new ExCuriousHouseResult(member.getResultType(), this)); player.sendPacket(new ExCuriousHouseResult(member.getResultType(), this));

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

@ -282,7 +282,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
final List<CeremonyOfChaosMember> winners = getWinners(); final List<CeremonyOfChaosMember> winners = getWinners();
final List<CeremonyOfChaosMember> members = new ArrayList<>(getMembers().size()); final List<CeremonyOfChaosMember> members = new ArrayList<>(getMembers().size());
final SystemMessage msg; SystemMessage msg = null;
if (winners.isEmpty() || (winners.size() > 1)) if (winners.isEmpty() || (winners.size() > 1))
{ {
msg = SystemMessage.getSystemMessage(SystemMessageId.THERE_IS_NO_VICTOR_THE_MATCH_ENDS_IN_A_TIE); msg = SystemMessage.getSystemMessage(SystemMessageId.THERE_IS_NO_VICTOR_THE_MATCH_ENDS_IN_A_TIE);
@ -290,6 +290,8 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
else else
{ {
final PlayerInstance winner = winners.get(0).getPlayer(); final PlayerInstance winner = winners.get(0).getPlayer();
if (winner != null)
{
msg = SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_C1_YOU_WIN_THE_MATCH); msg = SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_C1_YOU_WIN_THE_MATCH);
msg.addString(winner.getName()); msg.addString(winner.getName());
@ -378,6 +380,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
GlobalVariablesManager.getInstance().set(GlobalVariablesManager.COC_TOP_MEMBER, winner.getObjectId()); GlobalVariablesManager.getInstance().set(GlobalVariablesManager.COC_TOP_MEMBER, winner.getObjectId());
} }
} }
}
for (CeremonyOfChaosMember member : getMembers().values()) for (CeremonyOfChaosMember member : getMembers().values())
{ {
@ -385,7 +388,10 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
if (player != null) if (player != null)
{ {
// Send winner message // Send winner message
if (msg != null)
{
player.sendPacket(msg); player.sendPacket(msg);
}
// Send result // Send result
player.sendPacket(new ExCuriousHouseResult(member.getResultType(), this)); player.sendPacket(new ExCuriousHouseResult(member.getResultType(), this));

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

@ -282,7 +282,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
final List<CeremonyOfChaosMember> winners = getWinners(); final List<CeremonyOfChaosMember> winners = getWinners();
final List<CeremonyOfChaosMember> members = new ArrayList<>(getMembers().size()); final List<CeremonyOfChaosMember> members = new ArrayList<>(getMembers().size());
final SystemMessage msg; SystemMessage msg = null;
if (winners.isEmpty() || (winners.size() > 1)) if (winners.isEmpty() || (winners.size() > 1))
{ {
msg = SystemMessage.getSystemMessage(SystemMessageId.THERE_IS_NO_VICTOR_THE_MATCH_ENDS_IN_A_TIE); msg = SystemMessage.getSystemMessage(SystemMessageId.THERE_IS_NO_VICTOR_THE_MATCH_ENDS_IN_A_TIE);
@ -290,6 +290,8 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
else else
{ {
final PlayerInstance winner = winners.get(0).getPlayer(); final PlayerInstance winner = winners.get(0).getPlayer();
if (winner != null)
{
msg = SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_C1_YOU_WIN_THE_MATCH); msg = SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_C1_YOU_WIN_THE_MATCH);
msg.addString(winner.getName()); msg.addString(winner.getName());
@ -378,6 +380,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
GlobalVariablesManager.getInstance().set(GlobalVariablesManager.COC_TOP_MEMBER, winner.getObjectId()); GlobalVariablesManager.getInstance().set(GlobalVariablesManager.COC_TOP_MEMBER, winner.getObjectId());
} }
} }
}
for (CeremonyOfChaosMember member : getMembers().values()) for (CeremonyOfChaosMember member : getMembers().values())
{ {
@ -385,7 +388,10 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
if (player != null) if (player != null)
{ {
// Send winner message // Send winner message
if (msg != null)
{
player.sendPacket(msg); player.sendPacket(msg);
}
// Send result // Send result
player.sendPacket(new ExCuriousHouseResult(member.getResultType(), this)); player.sendPacket(new ExCuriousHouseResult(member.getResultType(), this));

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

@ -282,7 +282,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
final List<CeremonyOfChaosMember> winners = getWinners(); final List<CeremonyOfChaosMember> winners = getWinners();
final List<CeremonyOfChaosMember> members = new ArrayList<>(getMembers().size()); final List<CeremonyOfChaosMember> members = new ArrayList<>(getMembers().size());
final SystemMessage msg; SystemMessage msg = null;
if (winners.isEmpty() || (winners.size() > 1)) if (winners.isEmpty() || (winners.size() > 1))
{ {
msg = SystemMessage.getSystemMessage(SystemMessageId.THERE_IS_NO_VICTOR_THE_MATCH_ENDS_IN_A_TIE); msg = SystemMessage.getSystemMessage(SystemMessageId.THERE_IS_NO_VICTOR_THE_MATCH_ENDS_IN_A_TIE);
@ -290,6 +290,8 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
else else
{ {
final PlayerInstance winner = winners.get(0).getPlayer(); final PlayerInstance winner = winners.get(0).getPlayer();
if (winner != null)
{
msg = SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_C1_YOU_WIN_THE_MATCH); msg = SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_C1_YOU_WIN_THE_MATCH);
msg.addString(winner.getName()); msg.addString(winner.getName());
@ -378,6 +380,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
GlobalVariablesManager.getInstance().set(GlobalVariablesManager.COC_TOP_MEMBER, winner.getObjectId()); GlobalVariablesManager.getInstance().set(GlobalVariablesManager.COC_TOP_MEMBER, winner.getObjectId());
} }
} }
}
for (CeremonyOfChaosMember member : getMembers().values()) for (CeremonyOfChaosMember member : getMembers().values())
{ {
@ -385,7 +388,10 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
if (player != null) if (player != null)
{ {
// Send winner message // Send winner message
if (msg != null)
{
player.sendPacket(msg); player.sendPacket(msg);
}
// Send result // Send result
player.sendPacket(new ExCuriousHouseResult(member.getResultType(), this)); player.sendPacket(new ExCuriousHouseResult(member.getResultType(), this));

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

@ -282,7 +282,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
final List<CeremonyOfChaosMember> winners = getWinners(); final List<CeremonyOfChaosMember> winners = getWinners();
final List<CeremonyOfChaosMember> members = new ArrayList<>(getMembers().size()); final List<CeremonyOfChaosMember> members = new ArrayList<>(getMembers().size());
final SystemMessage msg; SystemMessage msg = null;
if (winners.isEmpty() || (winners.size() > 1)) if (winners.isEmpty() || (winners.size() > 1))
{ {
msg = SystemMessage.getSystemMessage(SystemMessageId.THERE_IS_NO_VICTOR_THE_MATCH_ENDS_IN_A_TIE); msg = SystemMessage.getSystemMessage(SystemMessageId.THERE_IS_NO_VICTOR_THE_MATCH_ENDS_IN_A_TIE);
@ -290,6 +290,8 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
else else
{ {
final PlayerInstance winner = winners.get(0).getPlayer(); final PlayerInstance winner = winners.get(0).getPlayer();
if (winner != null)
{
msg = SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_C1_YOU_WIN_THE_MATCH); msg = SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_C1_YOU_WIN_THE_MATCH);
msg.addString(winner.getName()); msg.addString(winner.getName());
@ -378,6 +380,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
GlobalVariablesManager.getInstance().set(GlobalVariablesManager.COC_TOP_MEMBER, winner.getObjectId()); GlobalVariablesManager.getInstance().set(GlobalVariablesManager.COC_TOP_MEMBER, winner.getObjectId());
} }
} }
}
for (CeremonyOfChaosMember member : getMembers().values()) for (CeremonyOfChaosMember member : getMembers().values())
{ {
@ -385,7 +388,10 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
if (player != null) if (player != null)
{ {
// Send winner message // Send winner message
if (msg != null)
{
player.sendPacket(msg); player.sendPacket(msg);
}
// Send result // Send result
player.sendPacket(new ExCuriousHouseResult(member.getResultType(), this)); player.sendPacket(new ExCuriousHouseResult(member.getResultType(), this));