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)