Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@39953cf Take in account waterlogged blocks for scaffolding (#9676) PaperMC/Paper@471f4de Copy NBT in upgrade data neighbor ticks PaperMC/Paper@33bec7f Copy NBT in legacy dragon fight converter Purpur Changes: PurpurMC/Purpur@042e192 Updated Upstream (Pufferfish) PurpurMC/Purpur@617240e Updated Upstream (Paper) PurpurMC/Purpur@671c31a Updated Upstream (Paper)