Fixed npc collision bug
Merge branch 'master' of github.com:dsschwarz/dimensional