Fixed BotReportTable NPE.
This commit is contained in:
parent
90ba90db4c
commit
20fa7fd698
@ -236,7 +236,7 @@ public class BotReportTable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((bot.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan()))
|
if ((bot.getClan() != null) && (reporter.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan()))
|
||||||
{
|
{
|
||||||
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_WHEN_A_CLAN_WAR_HAS_BEEN_DECLARED);
|
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_WHEN_A_CLAN_WAR_HAS_BEEN_DECLARED);
|
||||||
return false;
|
return false;
|
||||||
|
@ -236,7 +236,7 @@ public class BotReportTable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((bot.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan()))
|
if ((bot.getClan() != null) && (reporter.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan()))
|
||||||
{
|
{
|
||||||
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_WHEN_A_CLAN_WAR_HAS_BEEN_DECLARED);
|
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_WHEN_A_CLAN_WAR_HAS_BEEN_DECLARED);
|
||||||
return false;
|
return false;
|
||||||
|
@ -236,7 +236,7 @@ public class BotReportTable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((bot.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan()))
|
if ((bot.getClan() != null) && (reporter.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan()))
|
||||||
{
|
{
|
||||||
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_WHEN_A_CLAN_WAR_HAS_BEEN_DECLARED);
|
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_WHEN_A_CLAN_WAR_HAS_BEEN_DECLARED);
|
||||||
return false;
|
return false;
|
||||||
|
@ -236,7 +236,7 @@ public class BotReportTable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((bot.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan()))
|
if ((bot.getClan() != null) && (reporter.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan()))
|
||||||
{
|
{
|
||||||
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_WHEN_A_CLAN_WAR_HAS_BEEN_DECLARED);
|
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_WHEN_A_CLAN_WAR_HAS_BEEN_DECLARED);
|
||||||
return false;
|
return false;
|
||||||
|
@ -236,7 +236,7 @@ public class BotReportTable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((bot.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan()))
|
if ((bot.getClan() != null) && (reporter.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan()))
|
||||||
{
|
{
|
||||||
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_WHEN_A_CLAN_WAR_HAS_BEEN_DECLARED);
|
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_WHEN_A_CLAN_WAR_HAS_BEEN_DECLARED);
|
||||||
return false;
|
return false;
|
||||||
|
@ -236,7 +236,7 @@ public class BotReportTable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((bot.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan()))
|
if ((bot.getClan() != null) && (reporter.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan()))
|
||||||
{
|
{
|
||||||
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_WHEN_A_CLAN_WAR_HAS_BEEN_DECLARED);
|
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_WHEN_A_CLAN_WAR_HAS_BEEN_DECLARED);
|
||||||
return false;
|
return false;
|
||||||
|
@ -236,7 +236,7 @@ public class BotReportTable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((bot.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan()))
|
if ((bot.getClan() != null) && (reporter.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan()))
|
||||||
{
|
{
|
||||||
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_WHEN_A_CLAN_WAR_HAS_BEEN_DECLARED);
|
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_WHEN_A_CLAN_WAR_HAS_BEEN_DECLARED);
|
||||||
return false;
|
return false;
|
||||||
|
@ -236,7 +236,7 @@ public class BotReportTable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((bot.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan()))
|
if ((bot.getClan() != null) && (reporter.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan()))
|
||||||
{
|
{
|
||||||
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_WHEN_A_CLAN_WAR_HAS_BEEN_DECLARED);
|
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_WHEN_A_CLAN_WAR_HAS_BEEN_DECLARED);
|
||||||
return false;
|
return false;
|
||||||
|
@ -236,7 +236,7 @@ public class BotReportTable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((bot.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan()))
|
if ((bot.getClan() != null) && (reporter.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan()))
|
||||||
{
|
{
|
||||||
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_WHEN_A_CLAN_WAR_HAS_BEEN_DECLARED);
|
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_WHEN_A_CLAN_WAR_HAS_BEEN_DECLARED);
|
||||||
return false;
|
return false;
|
||||||
|
@ -236,7 +236,7 @@ public class BotReportTable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((bot.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan()))
|
if ((bot.getClan() != null) && (reporter.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan()))
|
||||||
{
|
{
|
||||||
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_WHEN_A_CLAN_WAR_HAS_BEEN_DECLARED);
|
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_WHEN_A_CLAN_WAR_HAS_BEEN_DECLARED);
|
||||||
return false;
|
return false;
|
||||||
|
@ -236,7 +236,7 @@ public class BotReportTable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((bot.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan()))
|
if ((bot.getClan() != null) && (reporter.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan()))
|
||||||
{
|
{
|
||||||
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_WHEN_A_CLAN_WAR_HAS_BEEN_DECLARED);
|
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_WHEN_A_CLAN_WAR_HAS_BEEN_DECLARED);
|
||||||
return false;
|
return false;
|
||||||
|
@ -236,7 +236,7 @@ public class BotReportTable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((bot.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan()))
|
if ((bot.getClan() != null) && (reporter.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan()))
|
||||||
{
|
{
|
||||||
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_WHEN_A_CLAN_WAR_HAS_BEEN_DECLARED);
|
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_WHEN_A_CLAN_WAR_HAS_BEEN_DECLARED);
|
||||||
return false;
|
return false;
|
||||||
|
@ -236,7 +236,7 @@ public class BotReportTable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((bot.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan()))
|
if ((bot.getClan() != null) && (reporter.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan()))
|
||||||
{
|
{
|
||||||
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_WHEN_A_CLAN_WAR_HAS_BEEN_DECLARED);
|
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_WHEN_A_CLAN_WAR_HAS_BEEN_DECLARED);
|
||||||
return false;
|
return false;
|
||||||
|
@ -236,7 +236,7 @@ public class BotReportTable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((bot.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan()))
|
if ((bot.getClan() != null) && (reporter.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan()))
|
||||||
{
|
{
|
||||||
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_WHEN_A_CLAN_WAR_HAS_BEEN_DECLARED);
|
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_WHEN_A_CLAN_WAR_HAS_BEEN_DECLARED);
|
||||||
return false;
|
return false;
|
||||||
|
@ -236,7 +236,7 @@ public class BotReportTable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((bot.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan()))
|
if ((bot.getClan() != null) && (reporter.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan()))
|
||||||
{
|
{
|
||||||
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_WHEN_A_CLAN_WAR_HAS_BEEN_DECLARED);
|
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_WHEN_A_CLAN_WAR_HAS_BEEN_DECLARED);
|
||||||
return false;
|
return false;
|
||||||
|
@ -236,7 +236,7 @@ public class BotReportTable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((bot.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan()))
|
if ((bot.getClan() != null) && (reporter.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan()))
|
||||||
{
|
{
|
||||||
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_WHEN_A_CLAN_WAR_HAS_BEEN_DECLARED);
|
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_WHEN_A_CLAN_WAR_HAS_BEEN_DECLARED);
|
||||||
return false;
|
return false;
|
||||||
|
@ -236,7 +236,7 @@ public class BotReportTable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((bot.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan()))
|
if ((bot.getClan() != null) && (reporter.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan()))
|
||||||
{
|
{
|
||||||
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_WHEN_A_CLAN_WAR_HAS_BEEN_DECLARED);
|
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_WHEN_A_CLAN_WAR_HAS_BEEN_DECLARED);
|
||||||
return false;
|
return false;
|
||||||
|
Loading…
Reference in New Issue
Block a user