Prevent player jumping into nodes from below

Fixes camera glitch and cheating at drowning
Merge remote-tracking branch 'BlockMen/player_collision'

Conflicts:
	src/player.cpp