Tightened restrictions on neighbor checks.
Merge branch 'master' into WorldGen
Merge branch 'WorldGen'