Upstream has released updates that appears to apply and compile correctly
Paper Changes:
26fb7cc35 Fix Chunk Post Processing deadlock risk
ffecc4e26 Revert "Optimize entity list iteration requiring entities be in"
0a4286cc4 Prevent Fire from loading chunks
07915ea18 Add Player Client Options API (#2883)
bc48a3172 Optimize entity list iteration requiring entities be in loaded chunks
88092fef1 Optimize ChunkProviderServer's chunk level checking helper methods
01e8ce8d2 Forced Watchdog Crash support and Improve Async Shutdown
fdb8fe780 Be less strict with vanilla teleport command limits
0f06d3806 Restrict vanilla teleport command to within worldborder
24d93aafa Fix Optional null issue - Fixes#3155
eb71c5fa3 Fix incorect timing of mspt
1ca804342 Optimise entity hard collision checking
b67a42376 Don't run entity collision code if not needed
bd9aa547d Optimise ArraySetSorted#removeIf
Upstream has released updates that appears to apply and compile correctly
Paper Changes:
81706e626 Make the shutdown thread try to shutdown on main
891824509 Prevent opening inventories when frozen
e6d395cc8 Port 04-Util.patch from Tuinity (#3136)
59453f667 Fix incorrectly loading chunks on a cancelled interact event
bdcc31caa Let invalid positioned entities clean up previous chunk by the chunkCheck
