Merge pull request #1105 from stefanbeller/master

Avatar: Remove unneeded variable
Entities are pushed away from invalid tiles

#closes 1058