Don't pocket water while underwater

This should fix issue #7797
Ah in that case the old code had some very convoluted logic to accomplish that. Not the cleanest now, but it should work for all cases.