Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@7f85940 Updated Upstream (Bukkit) (#10255)
PaperMC/Paper@7ccefdc Fire entity knockback event for ownerless tnt (#7171)
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@31699ae Updated Upstream (Bukkit/CraftBukkit) (#10242)