Merge Spigot protocol hack support into main branch