Fixed probable clanhall door list NPE.

This commit is contained in:
MobiusDevelopment 2020-10-23 09:27:28 +00:00
parent 80a6917432
commit f179989bdb
15 changed files with 30 additions and 15 deletions

View File

@ -202,7 +202,8 @@ public class ClanHallData implements IXmlReader
final DoorInstance door = DoorData.getInstance().getDoor(doorId);
for (ClanHall ch : _clanHalls.values())
{
if (ch.getDoors().contains(door))
final List<DoorInstance> doors = ch.getDoors();
if ((doors != null) && doors.contains(door))
{
return ch;
}

View File

@ -202,7 +202,8 @@ public class ClanHallData implements IXmlReader
final DoorInstance door = DoorData.getInstance().getDoor(doorId);
for (ClanHall ch : _clanHalls.values())
{
if (ch.getDoors().contains(door))
final List<DoorInstance> doors = ch.getDoors();
if ((doors != null) && doors.contains(door))
{
return ch;
}

View File

@ -202,7 +202,8 @@ public class ClanHallData implements IXmlReader
final DoorInstance door = DoorData.getInstance().getDoor(doorId);
for (ClanHall ch : _clanHalls.values())
{
if (ch.getDoors().contains(door))
final List<DoorInstance> doors = ch.getDoors();
if ((doors != null) && doors.contains(door))
{
return ch;
}

View File

@ -202,7 +202,8 @@ public class ClanHallData implements IXmlReader
final DoorInstance door = DoorData.getInstance().getDoor(doorId);
for (ClanHall ch : _clanHalls.values())
{
if (ch.getDoors().contains(door))
final List<DoorInstance> doors = ch.getDoors();
if ((doors != null) && doors.contains(door))
{
return ch;
}

View File

@ -202,7 +202,8 @@ public class ClanHallData implements IXmlReader
final DoorInstance door = DoorData.getInstance().getDoor(doorId);
for (ClanHall ch : _clanHalls.values())
{
if (ch.getDoors().contains(door))
final List<DoorInstance> doors = ch.getDoors();
if ((doors != null) && doors.contains(door))
{
return ch;
}

View File

@ -202,7 +202,8 @@ public class ClanHallData implements IXmlReader
final DoorInstance door = DoorData.getInstance().getDoor(doorId);
for (ClanHall ch : _clanHalls.values())
{
if (ch.getDoors().contains(door))
final List<DoorInstance> doors = ch.getDoors();
if ((doors != null) && doors.contains(door))
{
return ch;
}

View File

@ -202,7 +202,8 @@ public class ClanHallData implements IXmlReader
final DoorInstance door = DoorData.getInstance().getDoor(doorId);
for (ClanHall ch : _clanHalls.values())
{
if (ch.getDoors().contains(door))
final List<DoorInstance> doors = ch.getDoors();
if ((doors != null) && doors.contains(door))
{
return ch;
}

View File

@ -202,7 +202,8 @@ public class ClanHallData implements IXmlReader
final DoorInstance door = DoorData.getInstance().getDoor(doorId);
for (ClanHall ch : _clanHalls.values())
{
if (ch.getDoors().contains(door))
final List<DoorInstance> doors = ch.getDoors();
if ((doors != null) && doors.contains(door))
{
return ch;
}

View File

@ -202,7 +202,8 @@ public class ClanHallData implements IXmlReader
final DoorInstance door = DoorData.getInstance().getDoor(doorId);
for (ClanHall ch : _clanHalls.values())
{
if (ch.getDoors().contains(door))
final List<DoorInstance> doors = ch.getDoors();
if ((doors != null) && doors.contains(door))
{
return ch;
}

View File

@ -202,7 +202,8 @@ public class ClanHallData implements IXmlReader
final DoorInstance door = DoorData.getInstance().getDoor(doorId);
for (ClanHall ch : _clanHalls.values())
{
if (ch.getDoors().contains(door))
final List<DoorInstance> doors = ch.getDoors();
if ((doors != null) && doors.contains(door))
{
return ch;
}

View File

@ -202,7 +202,8 @@ public class ClanHallData implements IXmlReader
final DoorInstance door = DoorData.getInstance().getDoor(doorId);
for (ClanHall ch : _clanHalls.values())
{
if (ch.getDoors().contains(door))
final List<DoorInstance> doors = ch.getDoors();
if ((doors != null) && doors.contains(door))
{
return ch;
}

View File

@ -202,7 +202,8 @@ public class ClanHallData implements IXmlReader
final DoorInstance door = DoorData.getInstance().getDoor(doorId);
for (ClanHall ch : _clanHalls.values())
{
if (ch.getDoors().contains(door))
final List<DoorInstance> doors = ch.getDoors();
if ((doors != null) && doors.contains(door))
{
return ch;
}

View File

@ -202,7 +202,8 @@ public class ClanHallData implements IXmlReader
final DoorInstance door = DoorData.getInstance().getDoor(doorId);
for (ClanHall ch : _clanHalls.values())
{
if (ch.getDoors().contains(door))
final List<DoorInstance> doors = ch.getDoors();
if ((doors != null) && doors.contains(door))
{
return ch;
}

View File

@ -202,7 +202,8 @@ public class ClanHallData implements IXmlReader
final DoorInstance door = DoorData.getInstance().getDoor(doorId);
for (ClanHall ch : _clanHalls.values())
{
if (ch.getDoors().contains(door))
final List<DoorInstance> doors = ch.getDoors();
if ((doors != null) && doors.contains(door))
{
return ch;
}

View File

@ -202,7 +202,8 @@ public class ClanHallData implements IXmlReader
final DoorInstance door = DoorData.getInstance().getDoor(doorId);
for (ClanHall ch : _clanHalls.values())
{
if (ch.getDoors().contains(door))
final List<DoorInstance> doors = ch.getDoors();
if ((doors != null) && doors.contains(door))
{
return ch;
}