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

Fixed FriendlyNpcInstance doDie killer NPE.

Browse Source
This commit is contained in:
MobiusDev 2019-01-19 22:43:29 +00:00
parent 11405bf351
commit 6a0e2121db
21 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java
View File

@ -94,7 +94,7 @@ public class FriendlyNpcInstance extends L2Attackable
return false;
}
if (killer.isAttackable())
if ((killer != null) && killer.isAttackable())
{
// Delayed notification
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(null, this, false), this);

1
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java
View File

@ -84,7 +84,6 @@ public class L2FortCommanderInstance extends L2DefenderInstance
if (getFort().getSiege().isInProgress())
{
getFort().getSiege().killedCommander(this);
}
return true;

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java
View File

@ -94,7 +94,7 @@ public class FriendlyNpcInstance extends L2Attackable
return false;
}
if (killer.isAttackable())
if ((killer != null) && killer.isAttackable())
{
// Delayed notification
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(null, this, false), this);

1
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java
View File

@ -84,7 +84,6 @@ public class L2FortCommanderInstance extends L2DefenderInstance
if (getFort().getSiege().isInProgress())
{
getFort().getSiege().killedCommander(this);
}
return true;

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java
View File

@ -94,7 +94,7 @@ public class FriendlyNpcInstance extends L2Attackable
return false;
}
if (killer.isAttackable())
if ((killer != null) && killer.isAttackable())
{
// Delayed notification
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(null, this, false), this);

1
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java
View File

@ -84,7 +84,6 @@ public class L2FortCommanderInstance extends L2DefenderInstance
if (getFort().getSiege().isInProgress())
{
getFort().getSiege().killedCommander(this);
}
return true;

2
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java
View File

@ -94,7 +94,7 @@ public class FriendlyNpcInstance extends L2Attackable
return false;
}
if (killer.isAttackable())
if ((killer != null) && killer.isAttackable())
{
// Delayed notification
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(null, this, false), this);

1
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java
View File

@ -84,7 +84,6 @@ public class L2FortCommanderInstance extends L2DefenderInstance
if (getFort().getSiege().isInProgress())
{
getFort().getSiege().killedCommander(this);
}
return true;

2
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java
View File

@ -94,7 +94,7 @@ public class FriendlyNpcInstance extends L2Attackable
return false;
}
if (killer.isAttackable())
if ((killer != null) && killer.isAttackable())
{
// Delayed notification
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(null, this, false), this);

1
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java
View File

@ -84,7 +84,6 @@ public class L2FortCommanderInstance extends L2DefenderInstance
if (getFort().getSiege().isInProgress())
{
getFort().getSiege().killedCommander(this);
}
return true;

2
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java
View File

@ -94,7 +94,7 @@ public class FriendlyNpcInstance extends L2Attackable
return false;
}
if (killer.isAttackable())
if ((killer != null) && killer.isAttackable())
{
// Delayed notification
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(null, this, false), this);

1
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java
View File

@ -84,7 +84,6 @@ public class L2FortCommanderInstance extends L2DefenderInstance
if (getFort().getSiege().isInProgress())
{
getFort().getSiege().killedCommander(this);
}
return true;

1
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java
View File

@ -90,7 +90,6 @@ public class L2FortCommanderInstance extends L2DefenderInstance
if (getFort().getSiege().isInProgress())
{
getFort().getSiege().killedCommander(this);
}
return true;

2
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java
View File

@ -94,7 +94,7 @@ public class FriendlyNpcInstance extends L2Attackable
return false;
}
if (killer.isAttackable())
if ((killer != null) && killer.isAttackable())
{
// Delayed notification
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(null, this, false), this);

1
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java
View File

@ -84,7 +84,6 @@ public class L2FortCommanderInstance extends L2DefenderInstance
if (getFort().getSiege().isInProgress())
{
getFort().getSiege().killedCommander(this);
}
return true;

2
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java
View File

@ -94,7 +94,7 @@ public class FriendlyNpcInstance extends L2Attackable
return false;
}
if (killer.isAttackable())
if ((killer != null) && killer.isAttackable())
{
// Delayed notification
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(null, this, false), this);

1
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java
View File

@ -84,7 +84,6 @@ public class L2FortCommanderInstance extends L2DefenderInstance
if (getFort().getSiege().isInProgress())
{
getFort().getSiege().killedCommander(this);
}
return true;

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java
View File

@ -94,7 +94,7 @@ public class FriendlyNpcInstance extends L2Attackable
return false;
}
if (killer.isAttackable())
if ((killer != null) && killer.isAttackable())
{
// Delayed notification
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(null, this, false), this);

1
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java
View File

@ -84,7 +84,6 @@ public class L2FortCommanderInstance extends L2DefenderInstance
if (getFort().getSiege().isInProgress())
{
getFort().getSiege().killedCommander(this);
}
return true;

2
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java
View File

@ -94,7 +94,7 @@ public class FriendlyNpcInstance extends L2Attackable
return false;
}
if (killer.isAttackable())
if ((killer != null) && killer.isAttackable())
{
// Delayed notification
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(null, this, false), this);

1
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java
View File

@ -84,7 +84,6 @@ public class L2FortCommanderInstance extends L2DefenderInstance
if (getFort().getSiege().isInProgress())
{
getFort().getSiege().killedCommander(this);
}
return true;