Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@1e035f3 Only attempt to find spawn position if there isn't a fixed spawn position set (#11682)
PaperMC/Paper@0f90942 Fix non-null initialisation of context collision shape
PaperMC/Paper@4bc80b8 Do not break when PlayerNaturallySpawnCreaturesEvent is cancelled
PaperMC/Paper@ae80a25 Properly handle large values of spawnChunkRadius
PaperMC/Paper@c2294d7 Fix several off-by-one errors in view distance calculations
PaperMC/Paper@da71382 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11702)
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@2aaf436 Validate slot in PlayerInventory#setSlot (#11399)
PaperMC/Paper@5c82955 Only mark decorations dirty if a removal actually occurs (#11413)
PaperMC/Paper@c5a1066 Remove wall-time / unused skip tick protection (#11412)