Merge branch 'dev/1.1.0' into dev/2.0.0

This commit is contained in:
Andrew Steinborn
2020-11-05 16:39:26 -05:00
8 changed files with 138 additions and 94 deletions

View File

@@ -122,7 +122,7 @@ public enum ProtocolVersion {
* @return the protocol version
*/
public int getProtocol() {
return protocol;
return protocol == -1 ? snapshotProtocol : protocol;
}
/**