Move pickup logic to rover moved event