Upstream has released updates that appears to apply and compile correctly
Paper Changes:
23ee0a8a Fix issue with 0,0 chunks causing crash
bc8fafb2 Updated Upstream (CraftBukkit/Spigot)
ebbca5ce Drowned is a RangedEntity (fixes API for Drowned to support Ranged)
83b03eee Don't move existing players to world spawn
3b3e38fd Fix issue with loading chunk during ticking chunks issue
78431dca Update test server startup script
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)