So doing around in a hardcore map I spawed in a cold biome with deers all over the place that turns out dont spawn leather... so with no way to pick up or drink water after running around for a day an a half I died..... sad story.

So how about, when you are empty handed over a water source block it will drink a little bit of dirty water?

Already have an issue for this: #204