Fix issue when villages spawn too close from one another
Fix use of deprecated flagmask