Reset fall damage when hitting an enemy

Title is fairly self explanatory, this is a small change but every time I land on an enemy I'm relieved that I won't take fall damage and then I get hurt anyways which is pretty annoying.

If this is not desired the other option is to have the fall damage effect the player when it hits the enemy rather than when it hits the floor.