Improved Air block collision check
Fixed #1960