my suggestion is to add a command to drain all water/lava on the residence. this personally would help alot for my current build, but I also know of one other person who had the same issue today, and sometimes its just impossible without filling in the entire area(which if its a 60x60x30 area, is tough)
/res drain [water/lava] <-- Possible command It is honestly not a bad idea; maybe if it is possible, the drain fills buckets in your inventory with the liquid if there is enough source blocks to fill the buckets.
