Upstream has released updates that appear to apply and compile correctly
Pufferfish Changes: pufferfish-gg/Pufferfish@af61ace Updated Upstream (Paper) pufferfish-gg/Pufferfish@d326aaa Pull patches from downstream pufferfish-gg/Pufferfish@a3a0bad Fix compile bug due to a purpur patch we don't have pufferfish-gg/Pufferfish@ddbd29b Rebrand tagging comments/packages pufferfish-gg/Pufferfish@29056e1 Fix pathfinding plugin compat pufferfish-gg/Pufferfish@f9e83e7 Should probably tag these pufferfish-gg/Pufferfish@7b2e7a7 Updated Upstream (Paper) pufferfish-gg/Pufferfish@fb77cb8 Attempt fix at citizens bug pufferfish-gg/Pufferfish@1a9b584 Fix citizens, part 2. This part needs to happen in the right order. (commit: 23a9f85)