OnAttackableKill should trigger when killer is a player symbol or trap.
Contributed by Sahar.
This commit is contained in:
parent
d36521724d
commit
2f8f708fd1
@ -304,7 +304,7 @@ public class Attackable extends Npc
|
||||
return false;
|
||||
}
|
||||
|
||||
if ((killer != null) && killer.isPlayable())
|
||||
if ((killer != null) && (killer.getActingPlayer() != null))
|
||||
{
|
||||
// Delayed notification
|
||||
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this);
|
||||
|
@ -297,7 +297,7 @@ public class Attackable extends Npc
|
||||
return false;
|
||||
}
|
||||
|
||||
if ((killer != null) && killer.isPlayable())
|
||||
if ((killer != null) && (killer.getActingPlayer() != null))
|
||||
{
|
||||
// Delayed notification
|
||||
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this);
|
||||
|
@ -297,7 +297,7 @@ public class Attackable extends Npc
|
||||
return false;
|
||||
}
|
||||
|
||||
if ((killer != null) && killer.isPlayable())
|
||||
if ((killer != null) && (killer.getActingPlayer() != null))
|
||||
{
|
||||
// Delayed notification
|
||||
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this);
|
||||
|
@ -297,7 +297,7 @@ public class Attackable extends Npc
|
||||
return false;
|
||||
}
|
||||
|
||||
if ((killer != null) && killer.isPlayable())
|
||||
if ((killer != null) && (killer.getActingPlayer() != null))
|
||||
{
|
||||
// Delayed notification
|
||||
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this);
|
||||
|
@ -296,7 +296,7 @@ public class Attackable extends Npc
|
||||
return false;
|
||||
}
|
||||
|
||||
if ((killer != null) && killer.isPlayable())
|
||||
if ((killer != null) && (killer.getActingPlayer() != null))
|
||||
{
|
||||
// Delayed notification
|
||||
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this);
|
||||
|
@ -296,7 +296,7 @@ public class Attackable extends Npc
|
||||
return false;
|
||||
}
|
||||
|
||||
if ((killer != null) && killer.isPlayable())
|
||||
if ((killer != null) && (killer.getActingPlayer() != null))
|
||||
{
|
||||
// Delayed notification
|
||||
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this);
|
||||
|
@ -296,7 +296,7 @@ public class Attackable extends Npc
|
||||
return false;
|
||||
}
|
||||
|
||||
if ((killer != null) && killer.isPlayable())
|
||||
if ((killer != null) && (killer.getActingPlayer() != null))
|
||||
{
|
||||
// Delayed notification
|
||||
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this);
|
||||
|
@ -296,7 +296,7 @@ public class Attackable extends Npc
|
||||
return false;
|
||||
}
|
||||
|
||||
if ((killer != null) && killer.isPlayable())
|
||||
if ((killer != null) && (killer.getActingPlayer() != null))
|
||||
{
|
||||
// Delayed notification
|
||||
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this);
|
||||
|
@ -316,7 +316,7 @@ public class Attackable extends Npc
|
||||
return false;
|
||||
}
|
||||
|
||||
if ((killer != null) && killer.isPlayable())
|
||||
if ((killer != null) && (killer.getActingPlayer() != null))
|
||||
{
|
||||
// Delayed notification
|
||||
EventDispatcher.getInstance().notifyEventAsyncDelayed(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this, _onKillDelay);
|
||||
@ -337,6 +337,7 @@ public class Attackable extends Npc
|
||||
mob.getMinionList().onMasterDie(false);
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -316,7 +316,7 @@ public class Attackable extends Npc
|
||||
return false;
|
||||
}
|
||||
|
||||
if ((killer != null) && killer.isPlayable())
|
||||
if ((killer != null) && (killer.getActingPlayer() != null))
|
||||
{
|
||||
// Delayed notification
|
||||
EventDispatcher.getInstance().notifyEventAsyncDelayed(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this, _onKillDelay);
|
||||
@ -337,6 +337,7 @@ public class Attackable extends Npc
|
||||
mob.getMinionList().onMasterDie(false);
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -297,7 +297,7 @@ public class Attackable extends Npc
|
||||
return false;
|
||||
}
|
||||
|
||||
if ((killer != null) && killer.isPlayable())
|
||||
if ((killer != null) && (killer.getActingPlayer() != null))
|
||||
{
|
||||
// Delayed notification
|
||||
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this);
|
||||
|
@ -297,7 +297,7 @@ public class Attackable extends Npc
|
||||
return false;
|
||||
}
|
||||
|
||||
if ((killer != null) && killer.isPlayable())
|
||||
if ((killer != null) && (killer.getActingPlayer() != null))
|
||||
{
|
||||
// Delayed notification
|
||||
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this);
|
||||
|
@ -297,7 +297,7 @@ public class Attackable extends Npc
|
||||
return false;
|
||||
}
|
||||
|
||||
if ((killer != null) && killer.isPlayable())
|
||||
if ((killer != null) && (killer.getActingPlayer() != null))
|
||||
{
|
||||
// Delayed notification
|
||||
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this);
|
||||
|
@ -299,7 +299,7 @@ public class Attackable extends Npc
|
||||
return false;
|
||||
}
|
||||
|
||||
if ((killer != null) && killer.isPlayable())
|
||||
if ((killer != null) && (killer.getActingPlayer() != null))
|
||||
{
|
||||
// Delayed notification
|
||||
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this);
|
||||
|
@ -299,7 +299,7 @@ public class Attackable extends Npc
|
||||
return false;
|
||||
}
|
||||
|
||||
if ((killer != null) && killer.isPlayable())
|
||||
if ((killer != null) && (killer.getActingPlayer() != null))
|
||||
{
|
||||
// Delayed notification
|
||||
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this);
|
||||
|
@ -299,7 +299,7 @@ public class Attackable extends Npc
|
||||
return false;
|
||||
}
|
||||
|
||||
if ((killer != null) && killer.isPlayable())
|
||||
if ((killer != null) && (killer.getActingPlayer() != null))
|
||||
{
|
||||
// Delayed notification
|
||||
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this);
|
||||
|
@ -297,7 +297,7 @@ public class Attackable extends Npc
|
||||
return false;
|
||||
}
|
||||
|
||||
if ((killer != null) && killer.isPlayable())
|
||||
if ((killer != null) && (killer.getActingPlayer() != null))
|
||||
{
|
||||
// Delayed notification
|
||||
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this);
|
||||
|
Loading…
Reference in New Issue
Block a user