As far as I know we could only fix this with a worldguard flag to block damage or poison, and I don't think that exists. Either that, or recoding water damage to happen within a radius of the map, rather than in all water in the world when that map is active. This isn't a priority to fix.