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

OnAttackableKill should trigger when killer is a player symbol or trap.

Browse Source 
Contributed by Sahar.
This commit is contained in:
MobiusDevelopment
2019-12-25 11:53:23 +00:00
parent d36521724d
commit 2f8f708fd1
17 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -304,7 +304,7 @@ public class Attackable extends Npc
return false; return false;
} }
if ((killer != null) && killer.isPlayable()) if ((killer != null) && (killer.getActingPlayer() != null))
{ {
// Delayed notification // Delayed notification
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this); EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this);

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

@@ -297,7 +297,7 @@ public class Attackable extends Npc
return false; return false;
} }
if ((killer != null) && killer.isPlayable()) if ((killer != null) && (killer.getActingPlayer() != null))
{ {
// Delayed notification // Delayed notification
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this); EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this);

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

@@ -297,7 +297,7 @@ public class Attackable extends Npc
return false; return false;
} }
if ((killer != null) && killer.isPlayable()) if ((killer != null) && (killer.getActingPlayer() != null))
{ {
// Delayed notification // Delayed notification
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this); EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this);

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

@@ -297,7 +297,7 @@ public class Attackable extends Npc
return false; return false;
} }
if ((killer != null) && killer.isPlayable()) if ((killer != null) && (killer.getActingPlayer() != null))
{ {
// Delayed notification // Delayed notification
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this); EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this);

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

@@ -296,7 +296,7 @@ public class Attackable extends Npc
return false; return false;
} }
if ((killer != null) && killer.isPlayable()) if ((killer != null) && (killer.getActingPlayer() != null))
{ {
// Delayed notification // Delayed notification
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this); EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this);

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

@@ -296,7 +296,7 @@ public class Attackable extends Npc
return false; return false;
} }
if ((killer != null) && killer.isPlayable()) if ((killer != null) && (killer.getActingPlayer() != null))
{ {
// Delayed notification // Delayed notification
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this); EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this);

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

@@ -296,7 +296,7 @@ public class Attackable extends Npc
return false; return false;
} }
if ((killer != null) && killer.isPlayable()) if ((killer != null) && (killer.getActingPlayer() != null))
{ {
// Delayed notification // Delayed notification
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this); EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this);

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

@@ -296,7 +296,7 @@ public class Attackable extends Npc
return false; return false;
} }
if ((killer != null) && killer.isPlayable()) if ((killer != null) && (killer.getActingPlayer() != null))
{ {
// Delayed notification // Delayed notification
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this); EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this);

3
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java
View File

@@ -316,7 +316,7 @@ public class Attackable extends Npc
return false; return false;
} }
if ((killer != null) && killer.isPlayable()) if ((killer != null) && (killer.getActingPlayer() != null))
{ {
// Delayed notification // Delayed notification
EventDispatcher.getInstance().notifyEventAsyncDelayed(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this, _onKillDelay); 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); mob.getMinionList().onMasterDie(false);
} }
} }
return true; return true;
} }

3
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java
View File

@@ -316,7 +316,7 @@ public class Attackable extends Npc
return false; return false;
} }
if ((killer != null) && killer.isPlayable()) if ((killer != null) && (killer.getActingPlayer() != null))
{ {
// Delayed notification // Delayed notification
EventDispatcher.getInstance().notifyEventAsyncDelayed(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this, _onKillDelay); 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); mob.getMinionList().onMasterDie(false);
} }
} }
return true; return true;
} }

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

@@ -297,7 +297,7 @@ public class Attackable extends Npc
return false; return false;
} }
if ((killer != null) && killer.isPlayable()) if ((killer != null) && (killer.getActingPlayer() != null))
{ {
// Delayed notification // Delayed notification
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this); EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this);

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

@@ -297,7 +297,7 @@ public class Attackable extends Npc
return false; return false;
} }
if ((killer != null) && killer.isPlayable()) if ((killer != null) && (killer.getActingPlayer() != null))
{ {
// Delayed notification // Delayed notification
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this); EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this);

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

@@ -297,7 +297,7 @@ public class Attackable extends Npc
return false; return false;
} }
if ((killer != null) && killer.isPlayable()) if ((killer != null) && (killer.getActingPlayer() != null))
{ {
// Delayed notification // Delayed notification
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this); EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this);

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

@@ -299,7 +299,7 @@ public class Attackable extends Npc
return false; return false;
} }
if ((killer != null) && killer.isPlayable()) if ((killer != null) && (killer.getActingPlayer() != null))
{ {
// Delayed notification // Delayed notification
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this); EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this);

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

@@ -299,7 +299,7 @@ public class Attackable extends Npc
return false; return false;
} }
if ((killer != null) && killer.isPlayable()) if ((killer != null) && (killer.getActingPlayer() != null))
{ {
// Delayed notification // Delayed notification
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this); EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this);

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

@@ -299,7 +299,7 @@ public class Attackable extends Npc
return false; return false;
} }
if ((killer != null) && killer.isPlayable()) if ((killer != null) && (killer.getActingPlayer() != null))
{ {
// Delayed notification // Delayed notification
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this); EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this);

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

@@ -297,7 +297,7 @@ public class Attackable extends Npc
return false; return false;
} }
if ((killer != null) && killer.isPlayable()) if ((killer != null) && (killer.getActingPlayer() != null))
{ {
// Delayed notification // Delayed notification
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this); EventDispatcher.getInstance().notifyEventAsync(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this);