Don't pocket water while underwater

This should fix issue #7797