Biome layer fixes/changes, thorn bush fix

Fixes thorn bushes so mobs/villagers escape when taking damage from
them.