Upstream has released updates that appears to apply and compile correctly
Paper Changes:
ffecc4e2 Revert "Optimize entity list iteration requiring entities be in"
0a4286cc Prevent Fire from loading chunks
07915ea1 Add Player Client Options API (#2883)
bc48a317 Optimize entity list iteration requiring entities be in loaded chunks
88092fef Optimize ChunkProviderServer's chunk level checking helper methods
01e8ce8d Forced Watchdog Crash support and Improve Async Shutdown
fdb8fe78 Be less strict with vanilla teleport command limits
Upstream has released updates that appears to apply and compile correctly
Paper Changes:
c096fe19 Port 20w15a Villager AI optimizations
832687de Restore preventing saving bad entities patch to full effect
df8eedee Restore Optimize Pathfinding patch
97b1cc36 Allow shutting down server during a watchdog hang gracefully
06044e24 Async command map building
