Merge the Protocollib fix into the snapshot patch

This is totally not just because I put the bump in the wrong patch