Upstream has released updates that appear to apply and compile correctly
Paper Changes: PaperMC/Paper@22ac7d6 Add internal netty pipeline events PaperMC/Paper@345a6a6 Updated Upstream (CraftBukkit) PaperMC/Paper@86f87ba Fix custom merchant trade event world reference PaperMC/Paper@734a436 Move patches over, start with first few PaperMC/Paper@faafca8 New work PaperMC/Paper@afb9e81 Fix timings diff PaperMC/Paper@08828fd More work PaperMC/Paper@50710fa More more work PaperMC/Paper@7a13367 More more more work PaperMC/Paper@aab4038 More more more more work PaperMC/Paper@c730403 More more more more work PaperMC/Paper@6b80b34 More more more more more more work PaperMC/Paper@c8f3d9e More more more more more more more work PaperMC/Paper@64cb313 some compile fixes PaperMC/Paper@063e6b2 Compile fixes PaperMC/Paper@cb6f029 More compile fixed PaperMC/Paper@d41ecbe Make it compie PaperMC/Paper@2184cd2 Fix chat message api using overlay PaperMC/Paper@c488d15 Don't fire preview event for non-player senders PaperMC/Paper@71544ab Readd deobfuscation of chat executor stacktraces PaperMC/Paper@4a4ee79 Separate out chat and commands sent via API (#8131) PaperMC/Paper@2acb479 [ci skip] Fix xray patch code style (#8196) PaperMC/Paper@3b895f3 Updated Upstream (CraftBukkit) PaperMC/Paper@e5bbb56 Added 1.19 kick event causes (#8204) (commit: 002f541)