I definitely need to rest day-two (((

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/L2Summon.java

@@ -198,17 +198,15 @@ public abstract class L2Summon extends L2Playable
 	@Override
 	public void onAction(L2PcInstance player)
     {
-		L2Object target = player.getTarget();
-
 		// Aggression target lock effect
-		if (player.isLockedTarget() && target != this)
+		if (player.isLockedTarget() && player.getLockedTarget() != this)
 		{
 			player.sendPacket(new SystemMessage(SystemMessageId.FAILED_CHANGE_TARGET));
 			player.sendPacket(ActionFailed.STATIC_PACKET);
 			return;
 		}
 
-        if (player == _owner && target == this)
+        if (player == _owner && player.getTarget() == this)
         {
             player.sendPacket(new PetStatusShow(this));
             player.sendPacket(ActionFailed.STATIC_PACKET);
@@ -226,7 +224,7 @@ public abstract class L2Summon extends L2Playable
 			su.addAttribute(StatusUpdate.MAX_HP, getMaxHp());
 			player.sendPacket(su);
         }
-        else if (target == this)
+        else if (player.getTarget() == this)
 		{
 			if (isAutoAttackable(player))
 			{