Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@8b1d26d Fix diff in sprint interruption option (Closes#10939)
PaperMC/Paper@0a1b133 Revert "Fixes exception log messages getting dropped during bootstrap (#10935)" (Closes#10945)