Move our config options out of spigot.yml and into paper.yml
Update from upstream