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

Fixed probable clanhall door list NPE.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

3
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
View File

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

3
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
View File

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

3
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
View File

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

3
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
View File

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

3
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
View File

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

3
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
View File

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

3
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
View File

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

3
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
View File

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

3
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
View File

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

3
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
View File

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

3
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
View File

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

3
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
View File

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

3
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
View File

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

3
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
View File

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

3
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
View File

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