From c77fcbd09fecec3228154baaf0027edd119e24bc Mon Sep 17 00:00:00 2001 From: Adrian Bergqvist Date: Fri, 10 Feb 2023 19:06:49 +0100 Subject: [PATCH] Validate config --- src/main/java/org/adde0109/ambassador/Ambassador.java | 1 + .../java/org/adde0109/ambassador/AmbassadorConfig.java | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/adde0109/ambassador/Ambassador.java b/src/main/java/org/adde0109/ambassador/Ambassador.java index 67aeb59..a83cecd 100644 --- a/src/main/java/org/adde0109/ambassador/Ambassador.java +++ b/src/main/java/org/adde0109/ambassador/Ambassador.java @@ -37,6 +37,7 @@ import java.nio.file.Path; import java.util.concurrent.TimeUnit; import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_19; +import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_19_3; import static com.velocitypowered.proxy.protocol.packet.brigadier.ArgumentIdentifier.mapSet; @Plugin(id = "ambassador", name = "Ambassador", version = "1.2.0-beta", authors = {"adde0109"}) diff --git a/src/main/java/org/adde0109/ambassador/AmbassadorConfig.java b/src/main/java/org/adde0109/ambassador/AmbassadorConfig.java index 819aab7..a00c678 100644 --- a/src/main/java/org/adde0109/ambassador/AmbassadorConfig.java +++ b/src/main/java/org/adde0109/ambassador/AmbassadorConfig.java @@ -27,7 +27,13 @@ public class AmbassadorConfig { public void validate() { final int connectionTimeout = Ambassador.getInstance().server.getConfiguration().getConnectTimeout(); if (resetTimeout >= connectionTimeout) { - throw new InvalidValueException("'reset-timeout' can't be larger than nor equal to 'connection-timeout': reset-timeout=" + resetTimeout + " connection-timeout=" + connectionTimeout); + throw new InvalidValueException("'reset-timeout' can't be more than nor equal to 'connection-timeout': reset-timeout=" + resetTimeout + " connection-timeout=" + connectionTimeout); + } + if (resetTimeout <= 0) { + throw new InvalidValueException("'reset-timeout' can't be less than nor equal to zero: reset-timeout=" + resetTimeout); + } + if (serverSwitchCancellationTime <= 0) { + throw new InvalidValueException("'server-switch-cancellation-time' can't be less than nor equal to zero: server-switch-cancellation-time=" + serverSwitchCancellationTime); } }