Added requireWaterContact and fixed a bug with the sorted block lists on
detection.