Correct an invalid if statement and using an EnumMap for the honor values.