Fix the combat spawn logic