Upstream merge (we must go deeper) SpigotMC/Spigot@1e7bc383c3
Fixes the issue of mobs constantly going North-West in pens and other areas backported from 1.8