Owners now properly enter combat when their companions do