Upstream has released updates that appears to apply and compile correctly
Paper Changes:
b7dc6fb0 fix double world add bug (#2486)
439131c7 Updated Upstream (Bukkit/CraftBukkit)
14e07afd [CI-SKIP] Fix patch number
fc570959 Improve POI data saving logic (#2475)
5ef93ded Fix#2499 (#2500)
b3aeba41 Update Paperclip, remove gson dependency in paperclip
26f644c5 Fix sign line capping check (#2522)
b2758246 Target more sync loads (#2476)
Upstream has released updates that appears to apply and compile correctly
Paper Changes:
21faf822 Implement optional per player mobspawning (#2171)
88722ec8 Prevent consuming the wrong itemstack (#2477)
294e3046 Async chunk api/io/loading (#2308)