Improvements for Compelling skill effect.

Contributed by Fakee.

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Compelling.java

@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.gameserver.ai.CtrlEvent;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,20 +41,41 @@ public class Compelling extends AbstractEffect
 	}
 	
 	@Override
-	public boolean isInstant()
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
 	{
-		return true;
+		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		{
+			return false;
+		}
+		
+		return effected.isPlayable() || effected.isAttackable();
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, Item item)
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		// Prevent compelling raids and town NPCs.
+		effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID);
-		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		compellingAction(effector, effected);
+	}
+	
+	@Override
+	public boolean onActionTime(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		compellingAction(null, effected);
+		return false;
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		if (!effected.isPlayer())
 		{
-			return;
+			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
 		}
-		
+	}
+	
+	private void compellingAction(Creature effector, Creature effected)
+	{
 		effected.setRunning();
 		effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effector.getLocation());
 	}

L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Compelling.java

@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.gameserver.ai.CtrlEvent;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,20 +41,41 @@ public class Compelling extends AbstractEffect
 	}
 	
 	@Override
-	public boolean isInstant()
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
 	{
-		return true;
+		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		{
+			return false;
+		}
+		
+		return effected.isPlayable() || effected.isAttackable();
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, Item item)
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		// Prevent compelling raids and town NPCs.
+		effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID);
-		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		compellingAction(effector, effected);
+	}
+	
+	@Override
+	public boolean onActionTime(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		compellingAction(null, effected);
+		return false;
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		if (!effected.isPlayer())
 		{
-			return;
+			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
 		}
-		
+	}
+	
+	private void compellingAction(Creature effector, Creature effected)
+	{
 		effected.setRunning();
 		effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effector.getLocation());
 	}

L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Compelling.java

@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.gameserver.ai.CtrlEvent;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,20 +41,41 @@ public class Compelling extends AbstractEffect
 	}
 	
 	@Override
-	public boolean isInstant()
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
 	{
-		return true;
+		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		{
+			return false;
+		}
+		
+		return effected.isPlayable() || effected.isAttackable();
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, Item item)
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		// Prevent compelling raids and town NPCs.
+		effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID);
-		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		compellingAction(effector, effected);
+	}
+	
+	@Override
+	public boolean onActionTime(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		compellingAction(null, effected);
+		return false;
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		if (!effected.isPlayer())
 		{
-			return;
+			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
 		}
-		
+	}
+	
+	private void compellingAction(Creature effector, Creature effected)
+	{
 		effected.setRunning();
 		effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effector.getLocation());
 	}

L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Compelling.java

@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.gameserver.ai.CtrlEvent;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,20 +41,41 @@ public class Compelling extends AbstractEffect
 	}
 	
 	@Override
-	public boolean isInstant()
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
 	{
-		return true;
+		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		{
+			return false;
+		}
+		
+		return effected.isPlayable() || effected.isAttackable();
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, Item item)
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		// Prevent compelling raids and town NPCs.
+		effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID);
-		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		compellingAction(effector, effected);
+	}
+	
+	@Override
+	public boolean onActionTime(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		compellingAction(null, effected);
+		return false;
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		if (!effected.isPlayer())
 		{
-			return;
+			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
 		}
-		
+	}
+	
+	private void compellingAction(Creature effector, Creature effected)
+	{
 		effected.setRunning();
 		effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effector.getLocation());
 	}

L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Compelling.java

@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.gameserver.ai.CtrlEvent;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,20 +41,41 @@ public class Compelling extends AbstractEffect
 	}
 	
 	@Override
-	public boolean isInstant()
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
 	{
-		return true;
+		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		{
+			return false;
+		}
+		
+		return effected.isPlayable() || effected.isAttackable();
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, Item item)
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		// Prevent compelling raids and town NPCs.
+		effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID);
-		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		compellingAction(effector, effected);
+	}
+	
+	@Override
+	public boolean onActionTime(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		compellingAction(null, effected);
+		return false;
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		if (!effected.isPlayer())
 		{
-			return;
+			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
 		}
-		
+	}
+	
+	private void compellingAction(Creature effector, Creature effected)
+	{
 		effected.setRunning();
 		effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effector.getLocation());
 	}

L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Compelling.java

@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.gameserver.ai.CtrlEvent;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,20 +41,41 @@ public class Compelling extends AbstractEffect
 	}
 	
 	@Override
-	public boolean isInstant()
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
 	{
-		return true;
+		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		{
+			return false;
+		}
+		
+		return effected.isPlayable() || effected.isAttackable();
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, Item item)
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		// Prevent compelling raids and town NPCs.
+		effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID);
-		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		compellingAction(effector, effected);
+	}
+	
+	@Override
+	public boolean onActionTime(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		compellingAction(null, effected);
+		return false;
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		if (!effected.isPlayer())
 		{
-			return;
+			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
 		}
-		
+	}
+	
+	private void compellingAction(Creature effector, Creature effected)
+	{
 		effected.setRunning();
 		effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effector.getLocation());
 	}

L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Compelling.java

@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.gameserver.ai.CtrlEvent;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,20 +41,41 @@ public class Compelling extends AbstractEffect
 	}
 	
 	@Override
-	public boolean isInstant()
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
 	{
-		return true;
+		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		{
+			return false;
+		}
+		
+		return effected.isPlayable() || effected.isAttackable();
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, Item item)
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		// Prevent compelling raids and town NPCs.
+		effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID);
-		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		compellingAction(effector, effected);
+	}
+	
+	@Override
+	public boolean onActionTime(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		compellingAction(null, effected);
+		return false;
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		if (!effected.isPlayer())
 		{
-			return;
+			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
 		}
-		
+	}
+	
+	private void compellingAction(Creature effector, Creature effected)
+	{
 		effected.setRunning();
 		effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effector.getLocation());
 	}

L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Compelling.java

@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.gameserver.ai.CtrlEvent;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,20 +41,41 @@ public class Compelling extends AbstractEffect
 	}
 	
 	@Override
-	public boolean isInstant()
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
 	{
-		return true;
+		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		{
+			return false;
+		}
+		
+		return effected.isPlayable() || effected.isAttackable();
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, Item item)
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		// Prevent compelling raids and town NPCs.
+		effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID);
-		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		compellingAction(effector, effected);
+	}
+	
+	@Override
+	public boolean onActionTime(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		compellingAction(null, effected);
+		return false;
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		if (!effected.isPlayer())
 		{
-			return;
+			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
 		}
-		
+	}
+	
+	private void compellingAction(Creature effector, Creature effected)
+	{
 		effected.setRunning();
 		effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effector.getLocation());
 	}

L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Compelling.java

@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.gameserver.ai.CtrlEvent;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,20 +41,41 @@ public class Compelling extends AbstractEffect
 	}
 	
 	@Override
-	public boolean isInstant()
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
 	{
-		return true;
+		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		{
+			return false;
+		}
+		
+		return effected.isPlayable() || effected.isAttackable();
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, Item item)
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		// Prevent compelling raids and town NPCs.
+		effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID);
-		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		compellingAction(effector, effected);
+	}
+	
+	@Override
+	public boolean onActionTime(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		compellingAction(null, effected);
+		return false;
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		if (!effected.isPlayer())
 		{
-			return;
+			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
 		}
-		
+	}
+	
+	private void compellingAction(Creature effector, Creature effected)
+	{
 		effected.setRunning();
 		effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effector.getLocation());
 	}

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Compelling.java

@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.gameserver.ai.CtrlEvent;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,20 +41,41 @@ public class Compelling extends AbstractEffect
 	}
 	
 	@Override
-	public boolean isInstant()
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
 	{
-		return true;
+		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		{
+			return false;
+		}
+		
+		return effected.isPlayable() || effected.isAttackable();
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, Item item)
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		// Prevent compelling raids and town NPCs.
+		effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID);
-		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		compellingAction(effector, effected);
+	}
+	
+	@Override
+	public boolean onActionTime(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		compellingAction(null, effected);
+		return false;
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		if (!effected.isPlayer())
 		{
-			return;
+			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
 		}
-		
+	}
+	
+	private void compellingAction(Creature effector, Creature effected)
+	{
 		effected.setRunning();
 		effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effector.getLocation());
 	}

L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Compelling.java

@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.gameserver.ai.CtrlEvent;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,20 +41,41 @@ public class Compelling extends AbstractEffect
 	}
 	
 	@Override
-	public boolean isInstant()
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
 	{
-		return true;
+		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		{
+			return false;
+		}
+		
+		return effected.isPlayable() || effected.isAttackable();
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, Item item)
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		// Prevent compelling raids and town NPCs.
+		effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID);
-		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		compellingAction(effector, effected);
+	}
+	
+	@Override
+	public boolean onActionTime(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		compellingAction(null, effected);
+		return false;
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		if (!effected.isPlayer())
 		{
-			return;
+			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
 		}
-		
+	}
+	
+	private void compellingAction(Creature effector, Creature effected)
+	{
 		effected.setRunning();
 		effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effector.getLocation());
 	}

L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/Compelling.java

@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.gameserver.ai.CtrlEvent;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,20 +41,41 @@ public class Compelling extends AbstractEffect
 	}
 	
 	@Override
-	public boolean isInstant()
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
 	{
-		return true;
+		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		{
+			return false;
+		}
+		
+		return effected.isPlayable() || effected.isAttackable();
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, Item item)
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		// Prevent compelling raids and town NPCs.
+		effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID);
-		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		compellingAction(effector, effected);
+	}
+	
+	@Override
+	public boolean onActionTime(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		compellingAction(null, effected);
+		return false;
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		if (!effected.isPlayer())
 		{
-			return;
+			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
 		}
-		
+	}
+	
+	private void compellingAction(Creature effector, Creature effected)
+	{
 		effected.setRunning();
 		effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effector.getLocation());
 	}

L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/Compelling.java

@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.gameserver.ai.CtrlEvent;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,20 +41,41 @@ public class Compelling extends AbstractEffect
 	}
 	
 	@Override
-	public boolean isInstant()
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
 	{
-		return true;
+		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		{
+			return false;
+		}
+		
+		return effected.isPlayable() || effected.isAttackable();
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, Item item)
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		// Prevent compelling raids and town NPCs.
+		effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID);
-		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		compellingAction(effector, effected);
+	}
+	
+	@Override
+	public boolean onActionTime(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		compellingAction(null, effected);
+		return false;
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		if (!effected.isPlayer())
 		{
-			return;
+			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
 		}
-		
+	}
+	
+	private void compellingAction(Creature effector, Creature effected)
+	{
 		effected.setRunning();
 		effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effector.getLocation());
 	}

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Compelling.java

@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.gameserver.ai.CtrlEvent;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,20 +41,41 @@ public class Compelling extends AbstractEffect
 	}
 	
 	@Override
-	public boolean isInstant()
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
 	{
-		return true;
+		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		{
+			return false;
+		}
+		
+		return effected.isPlayable() || effected.isAttackable();
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, Item item)
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		// Prevent compelling raids and town NPCs.
+		effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID);
-		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		compellingAction(effector, effected);
+	}
+	
+	@Override
+	public boolean onActionTime(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		compellingAction(null, effected);
+		return false;
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		if (!effected.isPlayer())
 		{
-			return;
+			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
 		}
-		
+	}
+	
+	private void compellingAction(Creature effector, Creature effected)
+	{
 		effected.setRunning();
 		effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effector.getLocation());
 	}

L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/Compelling.java

@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.gameserver.ai.CtrlEvent;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,20 +41,41 @@ public class Compelling extends AbstractEffect
 	}
 	
 	@Override
-	public boolean isInstant()
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
 	{
-		return true;
+		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		{
+			return false;
+		}
+		
+		return effected.isPlayable() || effected.isAttackable();
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, Item item)
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		// Prevent compelling raids and town NPCs.
+		effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID);
-		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		compellingAction(effector, effected);
+	}
+	
+	@Override
+	public boolean onActionTime(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		compellingAction(null, effected);
+		return false;
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		if (!effected.isPlayer())
 		{
-			return;
+			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
 		}
-		
+	}
+	
+	private void compellingAction(Creature effector, Creature effected)
+	{
 		effected.setRunning();
 		effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effector.getLocation());
 	}

L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/Compelling.java

@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.gameserver.ai.CtrlEvent;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,20 +41,41 @@ public class Compelling extends AbstractEffect
 	}
 	
 	@Override
-	public boolean isInstant()
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
 	{
-		return true;
+		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		{
+			return false;
+		}
+		
+		return effected.isPlayable() || effected.isAttackable();
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, Item item)
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		// Prevent compelling raids and town NPCs.
+		effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID);
-		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		compellingAction(effector, effected);
+	}
+	
+	@Override
+	public boolean onActionTime(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		compellingAction(null, effected);
+		return false;
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		if (!effected.isPlayer())
 		{
-			return;
+			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
 		}
-		
+	}
+	
+	private void compellingAction(Creature effector, Creature effected)
+	{
 		effected.setRunning();
 		effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effector.getLocation());
 	}

L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Compelling.java

@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.gameserver.ai.CtrlEvent;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,20 +41,41 @@ public class Compelling extends AbstractEffect
 	}
 	
 	@Override
-	public boolean isInstant()
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
 	{
-		return true;
+		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		{
+			return false;
+		}
+		
+		return effected.isPlayable() || effected.isAttackable();
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, Item item)
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		// Prevent compelling raids and town NPCs.
+		effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID);
-		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		compellingAction(effector, effected);
+	}
+	
+	@Override
+	public boolean onActionTime(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		compellingAction(null, effected);
+		return false;
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		if (!effected.isPlayer())
 		{
-			return;
+			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
 		}
-		
+	}
+	
+	private void compellingAction(Creature effector, Creature effected)
+	{
 		effected.setRunning();
 		effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effector.getLocation());
 	}

L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/Compelling.java

@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.gameserver.ai.CtrlEvent;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,20 +41,41 @@ public class Compelling extends AbstractEffect
 	}
 	
 	@Override
-	public boolean isInstant()
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
 	{
-		return true;
+		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		{
+			return false;
+		}
+		
+		return effected.isPlayable() || effected.isAttackable();
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, Item item)
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		// Prevent compelling raids and town NPCs.
+		effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID);
-		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		compellingAction(effector, effected);
+	}
+	
+	@Override
+	public boolean onActionTime(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		compellingAction(null, effected);
+		return false;
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		if (!effected.isPlayer())
 		{
-			return;
+			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
 		}
-		
+	}
+	
+	private void compellingAction(Creature effector, Creature effected)
+	{
 		effected.setRunning();
 		effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effector.getLocation());
 	}

L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Compelling.java

@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.gameserver.ai.CtrlEvent;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,20 +41,41 @@ public class Compelling extends AbstractEffect
 	}
 	
 	@Override
-	public boolean isInstant()
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
 	{
-		return true;
+		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		{
+			return false;
+		}
+		
+		return effected.isPlayable() || effected.isAttackable();
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, Item item)
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		// Prevent compelling raids and town NPCs.
+		effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID);
-		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		compellingAction(effector, effected);
+	}
+	
+	@Override
+	public boolean onActionTime(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		compellingAction(null, effected);
+		return false;
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		if (!effected.isPlayer())
 		{
-			return;
+			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
 		}
-		
+	}
+	
+	private void compellingAction(Creature effector, Creature effected)
+	{
 		effected.setRunning();
 		effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effector.getLocation());
 	}

L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Compelling.java

@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.gameserver.ai.CtrlEvent;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,20 +41,41 @@ public class Compelling extends AbstractEffect
 	}
 	
 	@Override
-	public boolean isInstant()
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
 	{
-		return true;
+		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		{
+			return false;
+		}
+		
+		return effected.isPlayable() || effected.isAttackable();
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, Item item)
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		// Prevent compelling raids and town NPCs.
+		effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID);
-		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		compellingAction(effector, effected);
+	}
+	
+	@Override
+	public boolean onActionTime(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		compellingAction(null, effected);
+		return false;
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		if (!effected.isPlayer())
 		{
-			return;
+			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
 		}
-		
+	}
+	
+	private void compellingAction(Creature effector, Creature effected)
+	{
 		effected.setRunning();
 		effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effector.getLocation());
 	}

L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Compelling.java

@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.gameserver.ai.CtrlEvent;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,20 +41,41 @@ public class Compelling extends AbstractEffect
 	}
 	
 	@Override
-	public boolean isInstant()
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
 	{
-		return true;
+		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		{
+			return false;
+		}
+		
+		return effected.isPlayable() || effected.isAttackable();
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, Item item)
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		// Prevent compelling raids and town NPCs.
+		effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID);
-		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		compellingAction(effector, effected);
+	}
+	
+	@Override
+	public boolean onActionTime(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		compellingAction(null, effected);
+		return false;
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		if (!effected.isPlayer())
 		{
-			return;
+			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
 		}
-		
+	}
+	
+	private void compellingAction(Creature effector, Creature effected)
+	{
 		effected.setRunning();
 		effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effector.getLocation());
 	}

L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Compelling.java

@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.gameserver.ai.CtrlEvent;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,20 +41,41 @@ public class Compelling extends AbstractEffect
 	}
 	
 	@Override
-	public boolean isInstant()
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
 	{
-		return true;
+		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		{
+			return false;
+		}
+		
+		return effected.isPlayable() || effected.isAttackable();
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, Item item)
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		// Prevent compelling raids and town NPCs.
+		effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID);
-		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		compellingAction(effector, effected);
+	}
+	
+	@Override
+	public boolean onActionTime(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		compellingAction(null, effected);
+		return false;
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		if (!effected.isPlayer())
 		{
-			return;
+			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
 		}
-		
+	}
+	
+	private void compellingAction(Creature effector, Creature effected)
+	{
 		effected.setRunning();
 		effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effector.getLocation());
 	}

L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Compelling.java

@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.gameserver.ai.CtrlEvent;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,20 +41,41 @@ public class Compelling extends AbstractEffect
 	}
 	
 	@Override
-	public boolean isInstant()
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
 	{
-		return true;
+		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		{
+			return false;
+		}
+		
+		return effected.isPlayable() || effected.isAttackable();
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, Item item)
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		// Prevent compelling raids and town NPCs.
+		effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID);
-		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		compellingAction(effector, effected);
+	}
+	
+	@Override
+	public boolean onActionTime(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		compellingAction(null, effected);
+		return false;
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		if (!effected.isPlayer())
 		{
-			return;
+			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
 		}
-		
+	}
+	
+	private void compellingAction(Creature effector, Creature effected)
+	{
 		effected.setRunning();
 		effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effector.getLocation());
 	}

L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/Compelling.java

@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.gameserver.ai.CtrlEvent;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,20 +41,41 @@ public class Compelling extends AbstractEffect
 	}
 	
 	@Override
-	public boolean isInstant()
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
 	{
-		return true;
+		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		{
+			return false;
+		}
+		
+		return effected.isPlayable() || effected.isAttackable();
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, Item item)
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		// Prevent compelling raids and town NPCs.
+		effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID);
-		if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
+		compellingAction(effector, effected);
+	}
+	
+	@Override
+	public boolean onActionTime(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		compellingAction(null, effected);
+		return false;
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		if (!effected.isPlayer())
 		{
-			return;
+			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
 		}
-		
+	}
+	
+	private void compellingAction(Creature effector, Creature effected)
+	{
 		effected.setRunning();
 		effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effector.getLocation());
 	}