Changed some collision things in entities.

need enemies and lava to test