diff --git a/api/src/main/java/com/velocitypowered/api/network/ProtocolVersion.java b/api/src/main/java/com/velocitypowered/api/network/ProtocolVersion.java index 01b02b1b..7f6ee7fe 100644 --- a/api/src/main/java/com/velocitypowered/api/network/ProtocolVersion.java +++ b/api/src/main/java/com/velocitypowered/api/network/ProtocolVersion.java @@ -54,7 +54,7 @@ public enum ProtocolVersion { MINECRAFT_1_16_2(751, "1.16.2"), MINECRAFT_1_16_3(753, "1.16.3"), MINECRAFT_1_16_4(754, "1.16.4", "1.16.5"), - MINECRAFT_1_17(-1, 9, "1.17"); // Note: Indev as of 20w45a (754, borked by Mojang) + MINECRAFT_1_17(-1, 11, "1.17"); // Snapshot: 21w03a, future protocol: 755 private static final int SNAPSHOT_BIT = 30; diff --git a/api/src/main/java/com/velocitypowered/api/proxy/Player.java b/api/src/main/java/com/velocitypowered/api/proxy/Player.java index 4635c74f..5fb68d4c 100644 --- a/api/src/main/java/com/velocitypowered/api/proxy/Player.java +++ b/api/src/main/java/com/velocitypowered/api/proxy/Player.java @@ -252,8 +252,10 @@ public interface Player extends CommandSource, Identified, InboundConnection, * * @param url the URL for the resource pack * @param hash the SHA-1 hash value for the resource pack - * @param isRequired flag to set the resource pack as required in 1.17+ + * @param isRequired Only in 1.17+ or newer: If true shows the pack as required to play, + * and removes the decline option. Declining it anyway will disconnect the user. */ void sendResourcePack(String url, byte[] hash, boolean isRequired); } + diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/registry/DimensionData.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/registry/DimensionData.java index 7640d331..07b69bae 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/connection/registry/DimensionData.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/registry/DimensionData.java @@ -242,9 +242,9 @@ public final class DimensionData { Integer height = details.keySet().contains("height") ? details.getInt("height") : null; if (version.compareTo(ProtocolVersion.MINECRAFT_1_17) >= 0) { Preconditions.checkNotNull(height, - "DimensionData requires 'minY' to be present for this version"); - Preconditions.checkNotNull(minY, "DimensionData requires 'height' to be present for this version"); + Preconditions.checkNotNull(minY, + "DimensionData requires 'minY' to be present for this version"); } return new DimensionData( UNKNOWN_DIMENSION_ID, null, isNatural, ambientLight, isShrunk,