Add support for newest versions of Spigot