Upstream has released updates that appear to apply and compile correctly
Paper Changes: PaperMC/Paper@7569191 Send disguised chat for vanished players PaperMC/Paper@96fd31b Fix chunk sending when the computed time overflows (#8833) PaperMC/Paper@39aef52 Fix `Tick::addTo`/`::between` causing SOE (#8824) PaperMC/Paper@0c3311c Add Entity Body Yaw API (#8822) PaperMC/Paper@0c9ace8 Add AntiXray layered obfuscation mode (#8799) PaperMC/Paper@5eca964 [ci skip] Rebuild patches PaperMC/Paper@afa16e6 Modify offline mode warning to include Velocity line (#8812) PaperMC/Paper@de38a45 Add projectile hit simulation API (#8816) PaperMC/Paper@7e7e6b4 More Win Screen API (#8805) PaperMC/Paper@bd77b78 Fix desync of honeycomb when the event is canceled (#8713) PaperMC/Paper@bb05fcf Add missing isFuel Material entries (#8843) PaperMC/Paper@8d1acf6 Call PlayerReadyArrowEvent for when items in the offhand are used (#8842) PaperMC/Paper@f2f9e8c Remove patch that was made obsolete by vanilla (#8847) PaperMC/Paper@afe633d convert API/server tests to mockito (#8848) PaperMC/Paper@03a4e7a Updated Upstream (Bukkit/CraftBukkit) (#8832) PaperMC/Paper@5c87711 Make sure Registry is loaded after Bukkit.setServer() (#8853) PaperMC/Paper@27516ee Temp fix for EntityType.translationKey PaperMC/Paper@8fced9d [ci skip] Update paperweight to 1.5.1 (#8856) PaperMC/Paper@f9dc371 Fix calling UnknownCommandEvent (#8232) (commit: b4198fc)