Fixed probable CastleChamberlain NPE caused by missing fort id.

This commit is contained in:
MobiusDev 2019-02-27 23:15:49 +00:00
parent 64a65e5a67
commit 2973d4e4df
10 changed files with 40 additions and 0 deletions

View File

@ -420,6 +420,10 @@ public final class CastleChamberlain extends AbstractNpcAI
for (int id : fort)
{
final Fort fortress = FortManager.getInstance().getFortById(id);
if (fortress == null)
{
continue;
}
final int fortId = fortress.getResidenceId();
final String fortType = (fortId < 112) ? "1300133" : "1300134";
final String fortStatus;

View File

@ -420,6 +420,10 @@ public final class CastleChamberlain extends AbstractNpcAI
for (int id : fort)
{
final Fort fortress = FortManager.getInstance().getFortById(id);
if (fortress == null)
{
continue;
}
final int fortId = fortress.getResidenceId();
final String fortType = (fortId < 112) ? "1300133" : "1300134";
final String fortStatus;

View File

@ -420,6 +420,10 @@ public final class CastleChamberlain extends AbstractNpcAI
for (int id : fort)
{
final Fort fortress = FortManager.getInstance().getFortById(id);
if (fortress == null)
{
continue;
}
final int fortId = fortress.getResidenceId();
final String fortType = (fortId < 112) ? "1300133" : "1300134";
final String fortStatus;

View File

@ -420,6 +420,10 @@ public final class CastleChamberlain extends AbstractNpcAI
for (int id : fort)
{
final Fort fortress = FortManager.getInstance().getFortById(id);
if (fortress == null)
{
continue;
}
final int fortId = fortress.getResidenceId();
final String fortType = (fortId < 112) ? "1300133" : "1300134";
final String fortStatus;

View File

@ -420,6 +420,10 @@ public final class CastleChamberlain extends AbstractNpcAI
for (int id : fort)
{
final Fort fortress = FortManager.getInstance().getFortById(id);
if (fortress == null)
{
continue;
}
final int fortId = fortress.getResidenceId();
final String fortType = (fortId < 112) ? "1300133" : "1300134";
final String fortStatus;

View File

@ -420,6 +420,10 @@ public final class CastleChamberlain extends AbstractNpcAI
for (int id : fort)
{
final Fort fortress = FortManager.getInstance().getFortById(id);
if (fortress == null)
{
continue;
}
final int fortId = fortress.getResidenceId();
final String fortType = (fortId < 112) ? "1300133" : "1300134";
final String fortStatus;

View File

@ -420,6 +420,10 @@ public final class CastleChamberlain extends AbstractNpcAI
for (int id : fort)
{
final Fort fortress = FortManager.getInstance().getFortById(id);
if (fortress == null)
{
continue;
}
final int fortId = fortress.getResidenceId();
final String fortType = (fortId < 112) ? "1300133" : "1300134";
final String fortStatus;

View File

@ -420,6 +420,10 @@ public final class CastleChamberlain extends AbstractNpcAI
for (int id : fort)
{
final Fort fortress = FortManager.getInstance().getFortById(id);
if (fortress == null)
{
continue;
}
final int fortId = fortress.getResidenceId();
final String fortType = (fortId < 112) ? "1300133" : "1300134";
final String fortStatus;

View File

@ -420,6 +420,10 @@ public final class CastleChamberlain extends AbstractNpcAI
for (int id : fort)
{
final Fort fortress = FortManager.getInstance().getFortById(id);
if (fortress == null)
{
continue;
}
final int fortId = fortress.getResidenceId();
final String fortType = (fortId < 112) ? "1300133" : "1300134";
final String fortStatus;

View File

@ -420,6 +420,10 @@ public final class CastleChamberlain extends AbstractNpcAI
for (int id : fort)
{
final Fort fortress = FortManager.getInstance().getFortById(id);
if (fortress == null)
{
continue;
}
final int fortId = fortress.getResidenceId();
final String fortType = (fortId < 112) ? "1300133" : "1300134";
final String fortStatus;