Proper summon intention after stun.

L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java

@@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.ai.CtrlEvent;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.effects.AbstractEffect;
 import com.l2jmobius.gameserver.model.effects.EffectFlag;
 import com.l2jmobius.gameserver.model.effects.L2EffectType;
@@ -66,13 +67,27 @@ public final class BlockActions extends AbstractEffect
 	public void onExit(L2Character effector, L2Character effected, Skill skill)
 	{
 		_allowedSkills.stream().forEach(effected::removeBlockActionsAllowedSkill);
-		if (!effected.isPlayer())
+		if (effected.isPlayable())
 		{
-			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
+			if (effected.isSummon())
+			{
+				if ((effector != null) && !effector.isDead())
+				{
+					((L2Summon) effected).doAttack(effector);
+				}
+				else
+				{
+					effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effected.getActingPlayer());
+				}
+			}
+			else
+			{
+				effected.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+			}
 		}
 		else
 		{
-			effected.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
 		}
 	}
 }

L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java

@@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.ai.CtrlEvent;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.effects.AbstractEffect;
 import com.l2jmobius.gameserver.model.effects.EffectFlag;
 import com.l2jmobius.gameserver.model.effects.L2EffectType;
@@ -66,13 +67,27 @@ public final class BlockActions extends AbstractEffect
 	public void onExit(L2Character effector, L2Character effected, Skill skill)
 	{
 		_allowedSkills.stream().forEach(effected::removeBlockActionsAllowedSkill);
-		if (!effected.isPlayer())
+		if (effected.isPlayable())
 		{
-			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
+			if (effected.isSummon())
+			{
+				if ((effector != null) && !effector.isDead())
+				{
+					((L2Summon) effected).doAttack(effector);
+				}
+				else
+				{
+					effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effected.getActingPlayer());
+				}
+			}
+			else
+			{
+				effected.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+			}
 		}
 		else
 		{
-			effected.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
 		}
 	}
 }

L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java

@@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.ai.CtrlEvent;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.effects.AbstractEffect;
 import com.l2jmobius.gameserver.model.effects.EffectFlag;
 import com.l2jmobius.gameserver.model.effects.L2EffectType;
@@ -66,13 +67,27 @@ public final class BlockActions extends AbstractEffect
 	public void onExit(L2Character effector, L2Character effected, Skill skill)
 	{
 		_allowedSkills.stream().forEach(effected::removeBlockActionsAllowedSkill);
-		if (!effected.isPlayer())
+		if (effected.isPlayable())
 		{
-			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
+			if (effected.isSummon())
+			{
+				if ((effector != null) && !effector.isDead())
+				{
+					((L2Summon) effected).doAttack(effector);
+				}
+				else
+				{
+					effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effected.getActingPlayer());
+				}
+			}
+			else
+			{
+				effected.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+			}
 		}
 		else
 		{
-			effected.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
 		}
 	}
 }

L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java

@@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.ai.CtrlEvent;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.effects.AbstractEffect;
 import com.l2jmobius.gameserver.model.effects.EffectFlag;
 import com.l2jmobius.gameserver.model.effects.L2EffectType;
@@ -66,13 +67,27 @@ public final class BlockActions extends AbstractEffect
 	public void onExit(L2Character effector, L2Character effected, Skill skill)
 	{
 		_allowedSkills.stream().forEach(effected::removeBlockActionsAllowedSkill);
-		if (!effected.isPlayer())
+		if (effected.isPlayable())
 		{
-			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
+			if (effected.isSummon())
+			{
+				if ((effector != null) && !effector.isDead())
+				{
+					((L2Summon) effected).doAttack(effector);
+				}
+				else
+				{
+					effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effected.getActingPlayer());
+				}
+			}
+			else
+			{
+				effected.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+			}
 		}
 		else
 		{
-			effected.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
 		}
 	}
 }

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Stun.java

@@ -16,7 +16,10 @@
  */
 package handlers.effecthandlers;
 
+import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.model.StatsSet;
+import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.conditions.Condition;
 import com.l2jmobius.gameserver.model.effects.AbstractEffect;
 import com.l2jmobius.gameserver.model.effects.EffectFlag;
@@ -49,7 +52,20 @@ public final class Stun extends AbstractEffect
 	@Override
 	public void onExit(BuffInfo info)
 	{
-		info.getEffected().stopStunning(false);
+		final L2Character effected = info.getEffected();
+		effected.stopStunning(false);
+		if (effected.isSummon())
+		{
+			final L2Character effector = info.getEffector();
+			if ((effector != null) && !effector.isDead())
+			{
+				((L2Summon) effected).doSummonAttack(effector);
+			}
+			else
+			{
+				effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effected.getActingPlayer());
+			}
+		}
 	}
 	
 	@Override

L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Summon.java

@@ -945,12 +945,12 @@ public abstract class L2Summon extends L2Playable
 	
 	/**
 	 * Performs an attack to the owner's target.
+	 * @param target the target to attack.
 	 */
-	public void doAttack()
+	public void doSummonAttack(L2Object target)
 	{
 		if (_owner != null)
 		{
-			final L2Object target = _owner.getTarget();
 			if (target != null)
 			{
 				setTarget(target);

L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java

@@ -183,7 +183,7 @@ public final class RequestActionUse implements IClientIncomingPacket
 				{
 					if (summon.canAttack(_ctrlPressed))
 					{
-						summon.doAttack();
+						summon.doSummonAttack(target);
 					}
 				}
 				break;
@@ -241,7 +241,7 @@ public final class RequestActionUse implements IClientIncomingPacket
 				{
 					if (summon.canAttack(_ctrlPressed))
 					{
-						summon.doAttack();
+						summon.doSummonAttack(target);
 					}
 				}
 				break;

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

@@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.ai.CtrlEvent;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.effects.AbstractEffect;
 import com.l2jmobius.gameserver.model.effects.EffectFlag;
 import com.l2jmobius.gameserver.model.effects.L2EffectType;
@@ -66,13 +67,27 @@ public final class BlockActions extends AbstractEffect
 	public void onExit(L2Character effector, L2Character effected, Skill skill)
 	{
 		_allowedSkills.stream().forEach(effected::removeBlockActionsAllowedSkill);
-		if (!effected.isPlayer())
+		if (effected.isPlayable())
 		{
-			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
+			if (effected.isSummon())
+			{
+				if ((effector != null) && !effector.isDead())
+				{
+					((L2Summon) effected).doAttack(effector);
+				}
+				else
+				{
+					effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effected.getActingPlayer());
+				}
+			}
+			else
+			{
+				effected.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+			}
 		}
 		else
 		{
-			effected.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
 		}
 	}
 }

L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java

@@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.ai.CtrlEvent;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.effects.AbstractEffect;
 import com.l2jmobius.gameserver.model.effects.EffectFlag;
 import com.l2jmobius.gameserver.model.effects.L2EffectType;
@@ -66,13 +67,27 @@ public final class BlockActions extends AbstractEffect
 	public void onExit(L2Character effector, L2Character effected, Skill skill)
 	{
 		_allowedSkills.stream().forEach(effected::removeBlockActionsAllowedSkill);
-		if (!effected.isPlayer())
+		if (effected.isPlayable())
 		{
-			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
+			if (effected.isSummon())
+			{
+				if ((effector != null) && !effector.isDead())
+				{
+					((L2Summon) effected).doAttack(effector);
+				}
+				else
+				{
+					effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effected.getActingPlayer());
+				}
+			}
+			else
+			{
+				effected.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+			}
 		}
 		else
 		{
-			effected.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
 		}
 	}
 }

L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java

@@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.ai.CtrlEvent;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.effects.AbstractEffect;
 import com.l2jmobius.gameserver.model.effects.EffectFlag;
 import com.l2jmobius.gameserver.model.effects.L2EffectType;
@@ -66,13 +67,27 @@ public final class BlockActions extends AbstractEffect
 	public void onExit(L2Character effector, L2Character effected, Skill skill)
 	{
 		_allowedSkills.stream().forEach(effected::removeBlockActionsAllowedSkill);
-		if (!effected.isPlayer())
+		if (effected.isPlayable())
 		{
-			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
+			if (effected.isSummon())
+			{
+				if ((effector != null) && !effector.isDead())
+				{
+					((L2Summon) effected).doAttack(effector);
+				}
+				else
+				{
+					effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effected.getActingPlayer());
+				}
+			}
+			else
+			{
+				effected.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+			}
 		}
 		else
 		{
-			effected.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+			effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
 		}
 	}
 }