Upstream has released updates that appears to apply and compile correctly
Paper Changes:
d63075df Pass fireworks through vanished players (#3021)
4d991f19 [CI-SKIP] Rebuild patches
26070a0e Indicate ticking status in entity list command (#2856)
2ff7b480 Optimise Chunk#getFluid (#2860)
c23ebb78 Optimise ticklistserver (#2957)
Upstream has released updates that appears to apply and compile correctly
Paper Changes:
ad708dd3 Add option to allow iron golems to spawn in air (Closes#1965, Closes#1851)
b16fd5c3 Updated Upstream (Bukkit/CraftBukkit/Spigot)