Updated Spigot/Bungee

Bungee #821
Spigot #1308