contestada

Which revision of sentence 11 is punctuated correctly?
A.
"He never wavered, but his death prevented him from seeing the war, that he was willing to face, which happened 11 years later."
B.
"He never wavered, but his death prevented him from seeing the war that he was willing to face, which happened 11 years later."
C.
"He never wavered but his death prevented him from seeing the war, that he was willing to face, which happened 11 years later."
D.
"He never wavered but his death prevented him from seeing the war, that he was willing to face which happened 11 years later."