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)
Upstream has released updates that appears to apply and compile correctly
Paper Changes:
cdd0bb43 Update upstream CB/S
4ac40031 [CI-SKIP] The wheel in the sky keeps on turning
9530f1bd [CI-SKIP] Fix regression with scripts in directories with spaces