From 31a7e22719ea307ba6a45e3bd490cbb42347ffc1 Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Tue, 23 Jun 2020 07:59:05 -0400 Subject: [PATCH] Fix compile error with JDK 8 --- .../proxy/connection/registry/DimensionData.java | 7 +++---- .../proxy/connection/registry/DimensionInfo.java | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) 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 ca1f8ed80..b5c7193c4 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 @@ -48,14 +48,13 @@ public final class DimensionData { @Nullable Long fixedTime, @Nullable Boolean createDragonFight) { Preconditions.checkNotNull( registryIdentifier, "registryIdentifier cannot be null"); - Preconditions.checkArgument(registryIdentifier.length() > 0 && !registryIdentifier.isBlank(), + Preconditions.checkArgument(registryIdentifier.length() > 0, "registryIdentifier cannot be empty"); Preconditions.checkArgument(logicalHeight >= 0, "localHeight must be >= 0"); Preconditions.checkNotNull( burningBehaviourIdentifier, "burningBehaviourIdentifier cannot be null"); - Preconditions.checkArgument(burningBehaviourIdentifier.length() > 0 - && !burningBehaviourIdentifier.isBlank(), - "burningBehaviourIdentifier cannot be empty"); + Preconditions.checkArgument(burningBehaviourIdentifier.length() > 0, + "burningBehaviourIdentifier cannot be empty"); this.registryIdentifier = registryIdentifier; this.isNatural = isNatural; this.ambientLight = ambientLight; diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/registry/DimensionInfo.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/registry/DimensionInfo.java index fdfc3dc5d..ac5670194 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/connection/registry/DimensionInfo.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/registry/DimensionInfo.java @@ -21,13 +21,13 @@ public final class DimensionInfo { this.registryIdentifier = Preconditions.checkNotNull( registryIdentifier, "registryIdentifier cannot be null"); Preconditions.checkArgument( - registryIdentifier.length() > 0 && !registryIdentifier.isBlank(), - "registryIdentifier cannot be empty"); + registryIdentifier.length() > 0, + "registryIdentifier cannot be empty"); this.levelName = Preconditions.checkNotNull( levelName, "levelName cannot be null"); Preconditions.checkArgument( - levelName.length() > 0 && !levelName.isBlank(), - "registryIdentifier cannot be empty"); + levelName.length() > 0, + "registryIdentifier cannot be empty"); this.isFlat = isFlat; this.isDebugType = isDebugType; }