Fix bug in blackdeathdisaster and make trader ignore infected settlements