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

Fixed probable processQuestEvent NPE.

Browse Source 
Contributed by Sero.
This commit is contained in:
MobiusDevelopment 2021-04-20 18:17:49 +00:00
parent de143b8c2a
commit cdcad605af
19 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -1491,7 +1491,7 @@ public class PlayerInstance extends Playable
else if (_questNpcObject > 0) else if (_questNpcObject > 0)
{ {
final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); 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; final Npc npc = (Npc) object;
quest.notifyEvent(event, npc, this); quest.notifyEvent(event, npc, this);

2
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -1497,7 +1497,7 @@ public class PlayerInstance extends Playable
else if (_questNpcObject > 0) else if (_questNpcObject > 0)
{ {
final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); 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; final Npc npc = (Npc) object;
quest.notifyEvent(event, npc, this); quest.notifyEvent(event, npc, this);

2
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -1499,7 +1499,7 @@ public class PlayerInstance extends Playable
else if (_questNpcObject > 0) else if (_questNpcObject > 0)
{ {
final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); 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; final Npc npc = (Npc) object;
quest.notifyEvent(event, npc, this); quest.notifyEvent(event, npc, this);

2
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -1509,7 +1509,7 @@ public class PlayerInstance extends Playable
else if (_questNpcObject > 0) else if (_questNpcObject > 0)
{ {
final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); 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; final Npc npc = (Npc) object;
quest.notifyEvent(event, npc, this); quest.notifyEvent(event, npc, this);

2
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -1502,7 +1502,7 @@ public class PlayerInstance extends Playable
else if (_questNpcObject > 0) else if (_questNpcObject > 0)
{ {
final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); 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; final Npc npc = (Npc) object;
quest.notifyEvent(event, npc, this); quest.notifyEvent(event, npc, this);

2
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -1502,7 +1502,7 @@ public class PlayerInstance extends Playable
else if (_questNpcObject > 0) else if (_questNpcObject > 0)
{ {
final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); 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; final Npc npc = (Npc) object;
quest.notifyEvent(event, npc, this); quest.notifyEvent(event, npc, this);

2
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -1502,7 +1502,7 @@ public class PlayerInstance extends Playable
else if (_questNpcObject > 0) else if (_questNpcObject > 0)
{ {
final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); 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; final Npc npc = (Npc) object;
quest.notifyEvent(event, npc, this); quest.notifyEvent(event, npc, this);

2
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -1517,7 +1517,7 @@ public class PlayerInstance extends Playable
else if (_questNpcObject > 0) else if (_questNpcObject > 0)
{ {
final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); 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; final Npc npc = (Npc) object;
quest.notifyEvent(event, npc, this); quest.notifyEvent(event, npc, this);

2
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -1516,7 +1516,7 @@ public class PlayerInstance extends Playable
else if (_questNpcObject > 0) else if (_questNpcObject > 0)
{ {
final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); 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; final Npc npc = (Npc) object;
quest.notifyEvent(event, npc, this); quest.notifyEvent(event, npc, this);

2
L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -1516,7 +1516,7 @@ public class PlayerInstance extends Playable
else if (_questNpcObject > 0) else if (_questNpcObject > 0)
{ {
final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); 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; final Npc npc = (Npc) object;
quest.notifyEvent(event, npc, this); quest.notifyEvent(event, npc, this);

2
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -1455,7 +1455,7 @@ public class PlayerInstance extends Playable
else if (_questNpcObject > 0) else if (_questNpcObject > 0)
{ {
final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); 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; final Npc npc = (Npc) object;
quest.notifyEvent(event, npc, this); quest.notifyEvent(event, npc, this);

2
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -1455,7 +1455,7 @@ public class PlayerInstance extends Playable
else if (_questNpcObject > 0) else if (_questNpcObject > 0)
{ {
final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); 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; final Npc npc = (Npc) object;
quest.notifyEvent(event, npc, this); quest.notifyEvent(event, npc, this);

2
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -1453,7 +1453,7 @@ public class PlayerInstance extends Playable
else if (_questNpcObject > 0) else if (_questNpcObject > 0)
{ {
final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); 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; final Npc npc = (Npc) object;
quest.notifyEvent(event, npc, this); quest.notifyEvent(event, npc, this);

2
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -1463,7 +1463,7 @@ public class PlayerInstance extends Playable
else if (_questNpcObject > 0) else if (_questNpcObject > 0)
{ {
final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); 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; final Npc npc = (Npc) object;
quest.notifyEvent(event, npc, this); quest.notifyEvent(event, npc, this);

2
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -1463,7 +1463,7 @@ public class PlayerInstance extends Playable
else if (_questNpcObject > 0) else if (_questNpcObject > 0)
{ {
final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); 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; final Npc npc = (Npc) object;
quest.notifyEvent(event, npc, this); quest.notifyEvent(event, npc, this);

2
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -1479,7 +1479,7 @@ public class PlayerInstance extends Playable
else if (_questNpcObject > 0) else if (_questNpcObject > 0)
{ {
final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); 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; final Npc npc = (Npc) object;
quest.notifyEvent(event, npc, this); quest.notifyEvent(event, npc, this);

2
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -1457,7 +1457,7 @@ public class PlayerInstance extends Playable
else if (_questNpcObject > 0) else if (_questNpcObject > 0)
{ {
final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); 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; final Npc npc = (Npc) object;
quest.notifyEvent(event, npc, this); quest.notifyEvent(event, npc, this);

2
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -1519,7 +1519,7 @@ public class PlayerInstance extends Playable
else if (_questNpcObject > 0) else if (_questNpcObject > 0)
{ {
final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); 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; final Npc npc = (Npc) object;
quest.notifyEvent(event, npc, this); quest.notifyEvent(event, npc, this);

2
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -1519,7 +1519,7 @@ public class PlayerInstance extends Playable
else if (_questNpcObject > 0) else if (_questNpcObject > 0)
{ {
final WorldObject object = World.getInstance().findObject(getLastQuestNpcObject()); 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; final Npc npc = (Npc) object;
quest.notifyEvent(event, npc, this); quest.notifyEvent(event, npc, this);