f9fd34b11e
Be more strict about PersonType assignment
Original-merge: b56de6493f
Merged-by: crobibero <cody@robibe.ro>
Backported-by: Bond_009 <bond.009@outlook.com>