Upstream has released updates that appear to apply and compile correctly
Paper Changes: PaperMC/Paper@641dafd Cleanup some patches (#9093) PaperMC/Paper@497b919 Fix ignoreCancelled having no effect on events registered by direct EventExecutor (#9099) PaperMC/Paper@e6ef1ba [ci skip] Update download urls (#9100) PaperMC/Paper@9367e6e Prevent GameEvents being fired from unloaded chunks PaperMC/Paper@9b77660 Port airplane's use array for gamerule storage patch (#9087) PaperMC/Paper@dab4864 [ci skip] add workflow for auto-managing issue board (#8958) PaperMC/Paper@3c8c223 Fix some broken block place logic (#9094) PaperMC/Paper@f5677aa Fix TPS command output (#9091) PaperMC/Paper@e9f6e7a Properly resync player on Player#setPlayerProfile (#9080) PaperMC/Paper@ad6c14c Fix unknown cmd msg for mc namespaced cmds (#9059) PaperMC/Paper@29b17a8 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9088) PaperMC/Paper@b5ce6e3 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9104) PaperMC/Paper@9cda284 Updated Upstream (Bukkit/CraftBukkit) PaperMC/Paper@f8c0112 [ci skip] add missing labels to project status map (#9106) PaperMC/Paper@6a7fef0 Allow entity effect changes off the main thread for worldgen (#8942) (commit: b778163)