From 35b68597274fd681d61b6dfc6a76667b7dd38623 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 3 Apr 2022 07:36:21 +0000
Subject: [PATCH] SkillCaster triggerCast should notify finish cast event.

---
 .../l2jmobius/gameserver/model/skill/SkillCaster.java | 11 +++++++++++
 .../l2jmobius/gameserver/model/skill/SkillCaster.java | 11 +++++++++++
 .../l2jmobius/gameserver/model/skill/SkillCaster.java | 11 +++++++++++
 .../l2jmobius/gameserver/model/skill/SkillCaster.java | 11 +++++++++++
 .../l2jmobius/gameserver/model/skill/SkillCaster.java | 11 +++++++++++
 .../l2jmobius/gameserver/model/skill/SkillCaster.java | 11 +++++++++++
 .../l2jmobius/gameserver/model/skill/SkillCaster.java | 11 +++++++++++
 .../l2jmobius/gameserver/model/skill/SkillCaster.java | 11 +++++++++++
 .../l2jmobius/gameserver/model/skill/SkillCaster.java | 11 +++++++++++
 .../l2jmobius/gameserver/model/skill/SkillCaster.java | 11 +++++++++++
 .../l2jmobius/gameserver/model/skill/SkillCaster.java | 11 +++++++++++
 .../l2jmobius/gameserver/model/skill/SkillCaster.java | 11 +++++++++++
 .../l2jmobius/gameserver/model/skill/SkillCaster.java | 11 +++++++++++
 .../l2jmobius/gameserver/model/skill/SkillCaster.java | 11 +++++++++++
 .../l2jmobius/gameserver/model/skill/SkillCaster.java | 11 +++++++++++
 .../l2jmobius/gameserver/model/skill/SkillCaster.java | 11 +++++++++++
 .../l2jmobius/gameserver/model/skill/SkillCaster.java | 11 +++++++++++
 .../l2jmobius/gameserver/model/skill/SkillCaster.java | 11 +++++++++++
 .../l2jmobius/gameserver/model/skill/SkillCaster.java | 11 +++++++++++
 .../l2jmobius/gameserver/model/skill/SkillCaster.java | 11 +++++++++++
 .../l2jmobius/gameserver/model/skill/SkillCaster.java | 11 +++++++++++
 .../l2jmobius/gameserver/model/skill/SkillCaster.java | 11 +++++++++++
 .../l2jmobius/gameserver/model/skill/SkillCaster.java | 11 +++++++++++
 23 files changed, 253 insertions(+)

diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 7647a79b7e..4a157efcec 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -868,6 +868,17 @@ public class SkillCaster implements Runnable
 				
 				// Launch the magic skill and calculate its effects
 				skill.activateSkill(creature, item, targets);
+				
+				// Notify skill is casted.
+				if (creature.onCreatureSkillFinishCast == null)
+				{
+					creature.onCreatureSkillFinishCast = new OnCreatureSkillFinishCast();
+				}
+				creature.onCreatureSkillFinishCast.setCaster(creature);
+				creature.onCreatureSkillFinishCast.setTarget(target);
+				creature.onCreatureSkillFinishCast.setSkill(skill);
+				creature.onCreatureSkillFinishCast.setSimultaneously(skill.isWithoutAction());
+				EventDispatcher.getInstance().notifyEvent(creature.onCreatureSkillFinishCast, creature);
 			}
 		}
 		catch (Exception e)
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 5d375edee0..ed496ef422 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -868,6 +868,17 @@ public class SkillCaster implements Runnable
 				
 				// Launch the magic skill and calculate its effects
 				skill.activateSkill(creature, item, targets);
+				
+				// Notify skill is casted.
+				if (creature.onCreatureSkillFinishCast == null)
+				{
+					creature.onCreatureSkillFinishCast = new OnCreatureSkillFinishCast();
+				}
+				creature.onCreatureSkillFinishCast.setCaster(creature);
+				creature.onCreatureSkillFinishCast.setTarget(target);
+				creature.onCreatureSkillFinishCast.setSkill(skill);
+				creature.onCreatureSkillFinishCast.setSimultaneously(skill.isWithoutAction());
+				EventDispatcher.getInstance().notifyEvent(creature.onCreatureSkillFinishCast, creature);
 			}
 		}
 		catch (Exception e)
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 5d375edee0..ed496ef422 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -868,6 +868,17 @@ public class SkillCaster implements Runnable
 				
 				// Launch the magic skill and calculate its effects
 				skill.activateSkill(creature, item, targets);
+				
+				// Notify skill is casted.
+				if (creature.onCreatureSkillFinishCast == null)
+				{
+					creature.onCreatureSkillFinishCast = new OnCreatureSkillFinishCast();
+				}
+				creature.onCreatureSkillFinishCast.setCaster(creature);
+				creature.onCreatureSkillFinishCast.setTarget(target);
+				creature.onCreatureSkillFinishCast.setSkill(skill);
+				creature.onCreatureSkillFinishCast.setSimultaneously(skill.isWithoutAction());
+				EventDispatcher.getInstance().notifyEvent(creature.onCreatureSkillFinishCast, creature);
 			}
 		}
 		catch (Exception e)
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 5d375edee0..ed496ef422 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -868,6 +868,17 @@ public class SkillCaster implements Runnable
 				
 				// Launch the magic skill and calculate its effects
 				skill.activateSkill(creature, item, targets);
+				
+				// Notify skill is casted.
+				if (creature.onCreatureSkillFinishCast == null)
+				{
+					creature.onCreatureSkillFinishCast = new OnCreatureSkillFinishCast();
+				}
+				creature.onCreatureSkillFinishCast.setCaster(creature);
+				creature.onCreatureSkillFinishCast.setTarget(target);
+				creature.onCreatureSkillFinishCast.setSkill(skill);
+				creature.onCreatureSkillFinishCast.setSimultaneously(skill.isWithoutAction());
+				EventDispatcher.getInstance().notifyEvent(creature.onCreatureSkillFinishCast, creature);
 			}
 		}
 		catch (Exception e)
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 4cd475b3a5..56b4e1c506 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -868,6 +868,17 @@ public class SkillCaster implements Runnable
 				
 				// Launch the magic skill and calculate its effects
 				skill.activateSkill(creature, item, targets);
+				
+				// Notify skill is casted.
+				if (creature.onCreatureSkillFinishCast == null)
+				{
+					creature.onCreatureSkillFinishCast = new OnCreatureSkillFinishCast();
+				}
+				creature.onCreatureSkillFinishCast.setCaster(creature);
+				creature.onCreatureSkillFinishCast.setTarget(target);
+				creature.onCreatureSkillFinishCast.setSkill(skill);
+				creature.onCreatureSkillFinishCast.setSimultaneously(skill.isWithoutAction());
+				EventDispatcher.getInstance().notifyEvent(creature.onCreatureSkillFinishCast, creature);
 			}
 		}
 		catch (Exception e)
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 4cd475b3a5..56b4e1c506 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -868,6 +868,17 @@ public class SkillCaster implements Runnable
 				
 				// Launch the magic skill and calculate its effects
 				skill.activateSkill(creature, item, targets);
+				
+				// Notify skill is casted.
+				if (creature.onCreatureSkillFinishCast == null)
+				{
+					creature.onCreatureSkillFinishCast = new OnCreatureSkillFinishCast();
+				}
+				creature.onCreatureSkillFinishCast.setCaster(creature);
+				creature.onCreatureSkillFinishCast.setTarget(target);
+				creature.onCreatureSkillFinishCast.setSkill(skill);
+				creature.onCreatureSkillFinishCast.setSimultaneously(skill.isWithoutAction());
+				EventDispatcher.getInstance().notifyEvent(creature.onCreatureSkillFinishCast, creature);
 			}
 		}
 		catch (Exception e)
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 4cd475b3a5..56b4e1c506 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -868,6 +868,17 @@ public class SkillCaster implements Runnable
 				
 				// Launch the magic skill and calculate its effects
 				skill.activateSkill(creature, item, targets);
+				
+				// Notify skill is casted.
+				if (creature.onCreatureSkillFinishCast == null)
+				{
+					creature.onCreatureSkillFinishCast = new OnCreatureSkillFinishCast();
+				}
+				creature.onCreatureSkillFinishCast.setCaster(creature);
+				creature.onCreatureSkillFinishCast.setTarget(target);
+				creature.onCreatureSkillFinishCast.setSkill(skill);
+				creature.onCreatureSkillFinishCast.setSimultaneously(skill.isWithoutAction());
+				EventDispatcher.getInstance().notifyEvent(creature.onCreatureSkillFinishCast, creature);
 			}
 		}
 		catch (Exception e)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 83fa8eec42..b97a959384 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -868,6 +868,17 @@ public class SkillCaster implements Runnable
 				
 				// Launch the magic skill and calculate its effects
 				skill.activateSkill(creature, item, targets);
+				
+				// Notify skill is casted.
+				if (creature.onCreatureSkillFinishCast == null)
+				{
+					creature.onCreatureSkillFinishCast = new OnCreatureSkillFinishCast();
+				}
+				creature.onCreatureSkillFinishCast.setCaster(creature);
+				creature.onCreatureSkillFinishCast.setTarget(target);
+				creature.onCreatureSkillFinishCast.setSkill(skill);
+				creature.onCreatureSkillFinishCast.setSimultaneously(skill.isWithoutAction());
+				EventDispatcher.getInstance().notifyEvent(creature.onCreatureSkillFinishCast, creature);
 			}
 		}
 		catch (Exception e)
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index d4077d1d25..8ad3f28b9c 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -869,6 +869,17 @@ public class SkillCaster implements Runnable
 				
 				// Launch the magic skill and calculate its effects
 				skill.activateSkill(creature, item, targets);
+				
+				// Notify skill is casted.
+				if (creature.onCreatureSkillFinishCast == null)
+				{
+					creature.onCreatureSkillFinishCast = new OnCreatureSkillFinishCast();
+				}
+				creature.onCreatureSkillFinishCast.setCaster(creature);
+				creature.onCreatureSkillFinishCast.setTarget(target);
+				creature.onCreatureSkillFinishCast.setSkill(skill);
+				creature.onCreatureSkillFinishCast.setSimultaneously(skill.isWithoutAction());
+				EventDispatcher.getInstance().notifyEvent(creature.onCreatureSkillFinishCast, creature);
 			}
 		}
 		catch (Exception e)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index cb701ae625..0697922169 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -869,6 +869,17 @@ public class SkillCaster implements Runnable
 				
 				// Launch the magic skill and calculate its effects
 				skill.activateSkill(creature, item, targets);
+				
+				// Notify skill is casted.
+				if (creature.onCreatureSkillFinishCast == null)
+				{
+					creature.onCreatureSkillFinishCast = new OnCreatureSkillFinishCast();
+				}
+				creature.onCreatureSkillFinishCast.setCaster(creature);
+				creature.onCreatureSkillFinishCast.setTarget(target);
+				creature.onCreatureSkillFinishCast.setSkill(skill);
+				creature.onCreatureSkillFinishCast.setSimultaneously(skill.isWithoutAction());
+				EventDispatcher.getInstance().notifyEvent(creature.onCreatureSkillFinishCast, creature);
 			}
 		}
 		catch (Exception e)
diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index a722b7be86..fc430863bd 100644
--- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -869,6 +869,17 @@ public class SkillCaster implements Runnable
 				
 				// Launch the magic skill and calculate its effects
 				skill.activateSkill(creature, item, targets);
+				
+				// Notify skill is casted.
+				if (creature.onCreatureSkillFinishCast == null)
+				{
+					creature.onCreatureSkillFinishCast = new OnCreatureSkillFinishCast();
+				}
+				creature.onCreatureSkillFinishCast.setCaster(creature);
+				creature.onCreatureSkillFinishCast.setTarget(target);
+				creature.onCreatureSkillFinishCast.setSkill(skill);
+				creature.onCreatureSkillFinishCast.setSimultaneously(skill.isWithoutAction());
+				EventDispatcher.getInstance().notifyEvent(creature.onCreatureSkillFinishCast, creature);
 			}
 		}
 		catch (Exception e)
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index c0311b847d..9cd22f0668 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -869,6 +869,17 @@ public class SkillCaster implements Runnable
 				
 				// Launch the magic skill and calculate its effects
 				skill.activateSkill(creature, item, targets);
+				
+				// Notify skill is casted.
+				if (creature.onCreatureSkillFinishCast == null)
+				{
+					creature.onCreatureSkillFinishCast = new OnCreatureSkillFinishCast();
+				}
+				creature.onCreatureSkillFinishCast.setCaster(creature);
+				creature.onCreatureSkillFinishCast.setTarget(target);
+				creature.onCreatureSkillFinishCast.setSkill(skill);
+				creature.onCreatureSkillFinishCast.setSimultaneously(skill.isWithoutAction());
+				EventDispatcher.getInstance().notifyEvent(creature.onCreatureSkillFinishCast, creature);
 			}
 		}
 		catch (Exception e)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 64e90fbae2..310fce7da1 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -868,6 +868,17 @@ public class SkillCaster implements Runnable
 				
 				// Launch the magic skill and calculate its effects
 				skill.activateSkill(creature, item, targets);
+				
+				// Notify skill is casted.
+				if (creature.onCreatureSkillFinishCast == null)
+				{
+					creature.onCreatureSkillFinishCast = new OnCreatureSkillFinishCast();
+				}
+				creature.onCreatureSkillFinishCast.setCaster(creature);
+				creature.onCreatureSkillFinishCast.setTarget(target);
+				creature.onCreatureSkillFinishCast.setSkill(skill);
+				creature.onCreatureSkillFinishCast.setSimultaneously(skill.isWithoutAction());
+				EventDispatcher.getInstance().notifyEvent(creature.onCreatureSkillFinishCast, creature);
 			}
 		}
 		catch (Exception e)
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 64e90fbae2..310fce7da1 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -868,6 +868,17 @@ public class SkillCaster implements Runnable
 				
 				// Launch the magic skill and calculate its effects
 				skill.activateSkill(creature, item, targets);
+				
+				// Notify skill is casted.
+				if (creature.onCreatureSkillFinishCast == null)
+				{
+					creature.onCreatureSkillFinishCast = new OnCreatureSkillFinishCast();
+				}
+				creature.onCreatureSkillFinishCast.setCaster(creature);
+				creature.onCreatureSkillFinishCast.setTarget(target);
+				creature.onCreatureSkillFinishCast.setSkill(skill);
+				creature.onCreatureSkillFinishCast.setSimultaneously(skill.isWithoutAction());
+				EventDispatcher.getInstance().notifyEvent(creature.onCreatureSkillFinishCast, creature);
 			}
 		}
 		catch (Exception e)
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 64e90fbae2..310fce7da1 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -868,6 +868,17 @@ public class SkillCaster implements Runnable
 				
 				// Launch the magic skill and calculate its effects
 				skill.activateSkill(creature, item, targets);
+				
+				// Notify skill is casted.
+				if (creature.onCreatureSkillFinishCast == null)
+				{
+					creature.onCreatureSkillFinishCast = new OnCreatureSkillFinishCast();
+				}
+				creature.onCreatureSkillFinishCast.setCaster(creature);
+				creature.onCreatureSkillFinishCast.setTarget(target);
+				creature.onCreatureSkillFinishCast.setSkill(skill);
+				creature.onCreatureSkillFinishCast.setSimultaneously(skill.isWithoutAction());
+				EventDispatcher.getInstance().notifyEvent(creature.onCreatureSkillFinishCast, creature);
 			}
 		}
 		catch (Exception e)
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 64e90fbae2..310fce7da1 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -868,6 +868,17 @@ public class SkillCaster implements Runnable
 				
 				// Launch the magic skill and calculate its effects
 				skill.activateSkill(creature, item, targets);
+				
+				// Notify skill is casted.
+				if (creature.onCreatureSkillFinishCast == null)
+				{
+					creature.onCreatureSkillFinishCast = new OnCreatureSkillFinishCast();
+				}
+				creature.onCreatureSkillFinishCast.setCaster(creature);
+				creature.onCreatureSkillFinishCast.setTarget(target);
+				creature.onCreatureSkillFinishCast.setSkill(skill);
+				creature.onCreatureSkillFinishCast.setSimultaneously(skill.isWithoutAction());
+				EventDispatcher.getInstance().notifyEvent(creature.onCreatureSkillFinishCast, creature);
 			}
 		}
 		catch (Exception e)
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 64e90fbae2..310fce7da1 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -868,6 +868,17 @@ public class SkillCaster implements Runnable
 				
 				// Launch the magic skill and calculate its effects
 				skill.activateSkill(creature, item, targets);
+				
+				// Notify skill is casted.
+				if (creature.onCreatureSkillFinishCast == null)
+				{
+					creature.onCreatureSkillFinishCast = new OnCreatureSkillFinishCast();
+				}
+				creature.onCreatureSkillFinishCast.setCaster(creature);
+				creature.onCreatureSkillFinishCast.setTarget(target);
+				creature.onCreatureSkillFinishCast.setSkill(skill);
+				creature.onCreatureSkillFinishCast.setSimultaneously(skill.isWithoutAction());
+				EventDispatcher.getInstance().notifyEvent(creature.onCreatureSkillFinishCast, creature);
 			}
 		}
 		catch (Exception e)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 117ff1f52a..88ee87de38 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -873,6 +873,17 @@ public class SkillCaster implements Runnable
 				
 				// Launch the magic skill and calculate its effects
 				skill.activateSkill(creature, item, targets);
+				
+				// Notify skill is casted.
+				if (creature.onCreatureSkillFinishCast == null)
+				{
+					creature.onCreatureSkillFinishCast = new OnCreatureSkillFinishCast();
+				}
+				creature.onCreatureSkillFinishCast.setCaster(creature);
+				creature.onCreatureSkillFinishCast.setTarget(target);
+				creature.onCreatureSkillFinishCast.setSkill(skill);
+				creature.onCreatureSkillFinishCast.setSimultaneously(skill.isWithoutAction());
+				EventDispatcher.getInstance().notifyEvent(creature.onCreatureSkillFinishCast, creature);
 			}
 		}
 		catch (Exception e)
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 64e90fbae2..310fce7da1 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -868,6 +868,17 @@ public class SkillCaster implements Runnable
 				
 				// Launch the magic skill and calculate its effects
 				skill.activateSkill(creature, item, targets);
+				
+				// Notify skill is casted.
+				if (creature.onCreatureSkillFinishCast == null)
+				{
+					creature.onCreatureSkillFinishCast = new OnCreatureSkillFinishCast();
+				}
+				creature.onCreatureSkillFinishCast.setCaster(creature);
+				creature.onCreatureSkillFinishCast.setTarget(target);
+				creature.onCreatureSkillFinishCast.setSkill(skill);
+				creature.onCreatureSkillFinishCast.setSimultaneously(skill.isWithoutAction());
+				EventDispatcher.getInstance().notifyEvent(creature.onCreatureSkillFinishCast, creature);
 			}
 		}
 		catch (Exception e)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 3bdd84bbbd..4e723c8061 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -874,6 +874,17 @@ public class SkillCaster implements Runnable
 				
 				// Launch the magic skill and calculate its effects
 				skill.activateSkill(creature, item, targets);
+				
+				// Notify skill is casted.
+				if (creature.onCreatureSkillFinishCast == null)
+				{
+					creature.onCreatureSkillFinishCast = new OnCreatureSkillFinishCast();
+				}
+				creature.onCreatureSkillFinishCast.setCaster(creature);
+				creature.onCreatureSkillFinishCast.setTarget(target);
+				creature.onCreatureSkillFinishCast.setSkill(skill);
+				creature.onCreatureSkillFinishCast.setSimultaneously(skill.isWithoutAction());
+				EventDispatcher.getInstance().notifyEvent(creature.onCreatureSkillFinishCast, creature);
 			}
 		}
 		catch (Exception e)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 3bdd84bbbd..4e723c8061 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -874,6 +874,17 @@ public class SkillCaster implements Runnable
 				
 				// Launch the magic skill and calculate its effects
 				skill.activateSkill(creature, item, targets);
+				
+				// Notify skill is casted.
+				if (creature.onCreatureSkillFinishCast == null)
+				{
+					creature.onCreatureSkillFinishCast = new OnCreatureSkillFinishCast();
+				}
+				creature.onCreatureSkillFinishCast.setCaster(creature);
+				creature.onCreatureSkillFinishCast.setTarget(target);
+				creature.onCreatureSkillFinishCast.setSkill(skill);
+				creature.onCreatureSkillFinishCast.setSimultaneously(skill.isWithoutAction());
+				EventDispatcher.getInstance().notifyEvent(creature.onCreatureSkillFinishCast, creature);
 			}
 		}
 		catch (Exception e)
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 06878b17d4..877bc0fb2a 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -874,6 +874,17 @@ public class SkillCaster implements Runnable
 				
 				// Launch the magic skill and calculate its effects
 				skill.activateSkill(creature, item, targets);
+				
+				// Notify skill is casted.
+				if (creature.onCreatureSkillFinishCast == null)
+				{
+					creature.onCreatureSkillFinishCast = new OnCreatureSkillFinishCast();
+				}
+				creature.onCreatureSkillFinishCast.setCaster(creature);
+				creature.onCreatureSkillFinishCast.setTarget(target);
+				creature.onCreatureSkillFinishCast.setSkill(skill);
+				creature.onCreatureSkillFinishCast.setSimultaneously(skill.isWithoutAction());
+				EventDispatcher.getInstance().notifyEvent(creature.onCreatureSkillFinishCast, creature);
 			}
 		}
 		catch (Exception e)
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 06878b17d4..877bc0fb2a 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -874,6 +874,17 @@ public class SkillCaster implements Runnable
 				
 				// Launch the magic skill and calculate its effects
 				skill.activateSkill(creature, item, targets);
+				
+				// Notify skill is casted.
+				if (creature.onCreatureSkillFinishCast == null)
+				{
+					creature.onCreatureSkillFinishCast = new OnCreatureSkillFinishCast();
+				}
+				creature.onCreatureSkillFinishCast.setCaster(creature);
+				creature.onCreatureSkillFinishCast.setTarget(target);
+				creature.onCreatureSkillFinishCast.setSkill(skill);
+				creature.onCreatureSkillFinishCast.setSimultaneously(skill.isWithoutAction());
+				EventDispatcher.getInstance().notifyEvent(creature.onCreatureSkillFinishCast, creature);
 			}
 		}
 		catch (Exception e)