From f179989bdb8d4821fc39451af3f97cbb24803409 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 23 Oct 2020 09:27:28 +0000 Subject: [PATCH] Fixed probable clanhall door list NPE. --- .../org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java | 3 ++- .../org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java | 3 ++- .../org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java | 3 ++- .../org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java | 3 ++- .../org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java | 3 ++- .../org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java | 3 ++- .../org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java | 3 ++- .../org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java | 3 ++- .../org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java | 3 ++- .../org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java | 3 ++- .../org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java | 3 ++- .../org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java | 3 ++- .../org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java | 3 ++- .../org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java | 3 ++- .../org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java | 3 ++- 15 files changed, 30 insertions(+), 15 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java index 453ccf3147..0b1dc66dd3 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java @@ -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 doors = ch.getDoors(); + if ((doors != null) && doors.contains(door)) { return ch; } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java index 453ccf3147..0b1dc66dd3 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java @@ -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 doors = ch.getDoors(); + if ((doors != null) && doors.contains(door)) { return ch; } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java index 453ccf3147..0b1dc66dd3 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java @@ -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 doors = ch.getDoors(); + if ((doors != null) && doors.contains(door)) { return ch; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java index 453ccf3147..0b1dc66dd3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java @@ -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 doors = ch.getDoors(); + if ((doors != null) && doors.contains(door)) { return ch; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java index 453ccf3147..0b1dc66dd3 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java @@ -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 doors = ch.getDoors(); + if ((doors != null) && doors.contains(door)) { return ch; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java index 453ccf3147..0b1dc66dd3 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java @@ -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 doors = ch.getDoors(); + if ((doors != null) && doors.contains(door)) { return ch; } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java index 453ccf3147..0b1dc66dd3 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java @@ -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 doors = ch.getDoors(); + if ((doors != null) && doors.contains(door)) { return ch; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java index 453ccf3147..0b1dc66dd3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java @@ -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 doors = ch.getDoors(); + if ((doors != null) && doors.contains(door)) { return ch; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java index 453ccf3147..0b1dc66dd3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java @@ -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 doors = ch.getDoors(); + if ((doors != null) && doors.contains(door)) { return ch; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java index 453ccf3147..0b1dc66dd3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java @@ -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 doors = ch.getDoors(); + if ((doors != null) && doors.contains(door)) { return ch; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java index 453ccf3147..0b1dc66dd3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java @@ -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 doors = ch.getDoors(); + if ((doors != null) && doors.contains(door)) { return ch; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java index 453ccf3147..0b1dc66dd3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java @@ -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 doors = ch.getDoors(); + if ((doors != null) && doors.contains(door)) { return ch; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java index 453ccf3147..0b1dc66dd3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java @@ -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 doors = ch.getDoors(); + if ((doors != null) && doors.contains(door)) { return ch; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java index 453ccf3147..0b1dc66dd3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java @@ -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 doors = ch.getDoors(); + if ((doors != null) && doors.contains(door)) { return ch; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java index 453ccf3147..0b1dc66dd3 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java @@ -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 doors = ch.getDoors(); + if ((doors != null) && doors.contains(door)) { return ch; }