Make fluids in pipes and tanks keep their NBT tags (#1333)