Upstream has released updates that appears to apply and compile correctly
Paper Changes:
df0d7b0d Update upstream CB
6ea3c2cf [CI-SKIP] Rebuild patches
d7bed4cb Heavily optimise random block ticking (#2914)
b66d9ff8 Update upstream CB
ba71c5d6 Stop stripping private use block Unicode from signs
28d9dcfc Entity Jump API (#1587)
9976a768 Fix PlayerNaturallySpawnCreaturesEvent boolean inversion
054e20da Clean up imports on ThrownEggHatchEvent
a8984ccb Add ThrownEggHatchEvent (#1982)
9f24d495 Allow nerfed blazes, endermen to take water damage (#2847)
Upstream has released updates that appears to apply and compile correctly
Paper Changes:
bc447dc1 Track correct branch for /version
7dbceea2 Restore zero-tick farms fix
55944bc6 Revert "Drop fix zero-tick farms (Fixes#2736)"
3b93c5b1 Drop fix zero-tick farms (Fixes#2736)
31bc07cb Drop hopper optimization patch
788e0338 Don't set the count on already empty items in hopper moves (Fixes#2735)