From cdcad605affbb24c2c88eedd779e3c9a05c4b133 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 20 Apr 2021 18:17:49 +0000 Subject: [PATCH] Fixed probable processQuestEvent NPE. Contributed by Sero. --- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index eb141f1bc6..ecf5f3ee2b 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1491,7 +1491,7 @@ public class PlayerInstance extends Playable else if (_questNpcObject > 0) { final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); - if (object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) + if ((object != null) && object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) { final Npc npc = (Npc) object; quest.notifyEvent(event, npc, this); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 5fd19c986b..6acd54c473 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1497,7 +1497,7 @@ public class PlayerInstance extends Playable else if (_questNpcObject > 0) { final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); - if (object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) + if ((object != null) && object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) { final Npc npc = (Npc) object; quest.notifyEvent(event, npc, this); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 934338438d..a4ef83e450 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1499,7 +1499,7 @@ public class PlayerInstance extends Playable else if (_questNpcObject > 0) { final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); - if (object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) + if ((object != null) && object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) { final Npc npc = (Npc) object; quest.notifyEvent(event, npc, this); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index e9a56a3be8..d8f72cbd42 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1509,7 +1509,7 @@ public class PlayerInstance extends Playable else if (_questNpcObject > 0) { final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); - if (object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) + if ((object != null) && object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) { final Npc npc = (Npc) object; quest.notifyEvent(event, npc, this); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 2ca7db9dbb..e6cbc2cbef 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1502,7 +1502,7 @@ public class PlayerInstance extends Playable else if (_questNpcObject > 0) { final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); - if (object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) + if ((object != null) && object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) { final Npc npc = (Npc) object; quest.notifyEvent(event, npc, this); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index b51815034b..670d5feb20 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1502,7 +1502,7 @@ public class PlayerInstance extends Playable else if (_questNpcObject > 0) { final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); - if (object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) + if ((object != null) && object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) { final Npc npc = (Npc) object; quest.notifyEvent(event, npc, this); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index d6871ea1b1..1da359176c 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1502,7 +1502,7 @@ public class PlayerInstance extends Playable else if (_questNpcObject > 0) { final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); - if (object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) + if ((object != null) && object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) { final Npc npc = (Npc) object; quest.notifyEvent(event, npc, this); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 2e3bab9940..a31ca86549 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1517,7 +1517,7 @@ public class PlayerInstance extends Playable else if (_questNpcObject > 0) { final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); - if (object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) + if ((object != null) && object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) { final Npc npc = (Npc) object; quest.notifyEvent(event, npc, this); diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 0621c22c34..81b8934896 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1516,7 +1516,7 @@ public class PlayerInstance extends Playable else if (_questNpcObject > 0) { final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); - if (object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) + if ((object != null) && object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) { final Npc npc = (Npc) object; quest.notifyEvent(event, npc, this); diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 0621c22c34..81b8934896 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1516,7 +1516,7 @@ public class PlayerInstance extends Playable else if (_questNpcObject > 0) { final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); - if (object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) + if ((object != null) && object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) { final Npc npc = (Npc) object; quest.notifyEvent(event, npc, this); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index ede2afabb4..a9950813bc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1455,7 +1455,7 @@ public class PlayerInstance extends Playable else if (_questNpcObject > 0) { final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); - if (object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) + if ((object != null) && object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) { final Npc npc = (Npc) object; quest.notifyEvent(event, npc, this); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 7a97ec66c2..92cf96876c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1455,7 +1455,7 @@ public class PlayerInstance extends Playable else if (_questNpcObject > 0) { final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); - if (object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) + if ((object != null) && object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) { final Npc npc = (Npc) object; quest.notifyEvent(event, npc, this); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 3aaccfb41d..31194175cd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1453,7 +1453,7 @@ public class PlayerInstance extends Playable else if (_questNpcObject > 0) { final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); - if (object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) + if ((object != null) && object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) { final Npc npc = (Npc) object; quest.notifyEvent(event, npc, this); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 5b091f6822..35010c3879 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1463,7 +1463,7 @@ public class PlayerInstance extends Playable else if (_questNpcObject > 0) { final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); - if (object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) + if ((object != null) && object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) { final Npc npc = (Npc) object; quest.notifyEvent(event, npc, this); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index ebf8326728..3c49faa0bf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1463,7 +1463,7 @@ public class PlayerInstance extends Playable else if (_questNpcObject > 0) { final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); - if (object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) + if ((object != null) && object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) { final Npc npc = (Npc) object; quest.notifyEvent(event, npc, this); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 8110389599..287498071d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1479,7 +1479,7 @@ public class PlayerInstance extends Playable else if (_questNpcObject > 0) { final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); - if (object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) + if ((object != null) && object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) { final Npc npc = (Npc) object; quest.notifyEvent(event, npc, this); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 087dd6517c..54d66bc7b3 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1457,7 +1457,7 @@ public class PlayerInstance extends Playable else if (_questNpcObject > 0) { final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); - if (object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) + if ((object != null) && object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) { final Npc npc = (Npc) object; quest.notifyEvent(event, npc, this); diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 153017ab56..bdb5a71c44 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1519,7 +1519,7 @@ public class PlayerInstance extends Playable else if (_questNpcObject > 0) { final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); - if (object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) + if ((object != null) && object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) { final Npc npc = (Npc) object; quest.notifyEvent(event, npc, this); diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index c867b6f13e..bf0f87e118 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1519,7 +1519,7 @@ public class PlayerInstance extends Playable else if (_questNpcObject > 0) { final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); - if (object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) + if ((object != null) && object.isNpc() && isInsideRadius2D(object, Npc.INTERACTION_DISTANCE)) { final Npc npc = (Npc) object; quest.notifyEvent(event, npc, this);