Upstream has released updates that appear to apply and compile correctly
Paper Changes: PaperMC/Paper@d86fde5 Do not sync load chunk for dynamic game event listener registration PaperMC/Paper@1e5d1db Call StructureGrowEvent for mangrove propagule (#8023) PaperMC/Paper@385f313 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#8092) PaperMC/Paper@fbb11db Add missing EntityDropItemEvent calls (#5674) PaperMC/Paper@c879064 Call EntityDropItemEvent for goats dropping horns (#8094) PaperMC/Paper@a05e69b Add a bit of extra debugging to chat order/time errors PaperMC/Paper@6ea73e7 Fix Bee setFlower NPE (#8107) PaperMC/Paper@c4782f5 Add xp orb spawn reason for frogs (#8045) PaperMC/Paper@95ac874 Add ZombieVillager conversion without entity event (#8111) PaperMC/Paper@41238a4 [ci skip] Fixed typo in README (#8031) PaperMC/Paper@5ffeb70 Use getChunkForLighting instead of getChunkAtImmediately in fixlight to properly ignore imposter chunks PaperMC/Paper@e294802 Refactor paper command (#8112) PaperMC/Paper@b58063a Updated Upstream (Bukkit/CraftBukkit/Spigot) (#8124) PaperMC/Paper@e4f21e3 Move old user conversion down slightly (fixes #8050) (#8052) PaperMC/Paper@cd215af Fix #8138 (#8139) PaperMC/Paper@036a09c Fix spigot config not using commands.spam-exclusions (#8151) (commit: af61ace)