From 1690815bd960f89d93dbac9324c001ef4f7b3e88 Mon Sep 17 00:00:00 2001
From: Adrian Bergqvist <adde0109@gmail.com>
Date: Fri, 7 Apr 2023 16:13:14 +0200
Subject: [PATCH] Updated reset-timeout limit

---
 build.gradle.kts                                            | 6 +-----
 src/main/java/org/adde0109/ambassador/AmbassadorConfig.java | 6 +++---
 src/main/resources/default-ambassador.toml                  | 2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index a8ac9c0..010d06b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,14 +5,10 @@ plugins {
 }
 
 group = "org.adde0109"
-version = "1.3.1-beta-rc3"
+version = "1.3.1-beta-rc4"
 
 repositories {
     mavenCentral()
-    maven {
-        name = "papermc"
-        url = uri("https://repo.papermc.io/repository/maven-public/")
-    }
 }
 
 dependencies {
diff --git a/src/main/java/org/adde0109/ambassador/AmbassadorConfig.java b/src/main/java/org/adde0109/ambassador/AmbassadorConfig.java
index 10dbad8..72efeba 100644
--- a/src/main/java/org/adde0109/ambassador/AmbassadorConfig.java
+++ b/src/main/java/org/adde0109/ambassador/AmbassadorConfig.java
@@ -34,9 +34,9 @@ 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 more than to 'connection-timeout': reset-timeout=" + resetTimeout + " connection-timeout=" + connectionTimeout);
+    final int connectionTimeout = Ambassador.getInstance().server.getConfiguration().getReadTimeout();
+    if (resetTimeout >= connectionTimeout) {
+      throw new InvalidValueException("'reset-timeout' can't be more than nor equal to 'read-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);
diff --git a/src/main/resources/default-ambassador.toml b/src/main/resources/default-ambassador.toml
index f50768e..803c743 100644
--- a/src/main/resources/default-ambassador.toml
+++ b/src/main/resources/default-ambassador.toml
@@ -2,7 +2,7 @@
 config-version = "1.1"
 
 # How long to wait for the client to reset before disconnecting (In milliseconds)
-reset-timeout = 1000
+reset-timeout = 3000
 # Message displayed to the player when disconnected from proxy during server switch.
 # Legacy color codes and JSON are accepted.
 disconnect-reset-message = "&6Please reconnect"