Core/Items: Fixed swapping equipment sets in combat