From 986c5b9bcfa891c7e6a104dde98ce330cbdc0912 Mon Sep 17 00:00:00 2001
From: Iru21 <33987046+Iru21@users.noreply.github.com>
Date: Wed, 4 Jan 2023 19:04:10 +0100
Subject: [PATCH] Make time limit for auth configurable (#26)

---
 gradle.properties                             |  2 +-
 src/main/kotlin/me/iru/process/JoinProcess.kt | 26 ++++++++++---------
 src/main/resources/config.yml                 |  3 +++
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 592282c..0a7ecfe 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
 kotlin.code.style = official
 minecraftVersion = 1.17
 pluginName = Authy
-pluginVersion = 3.2.0
+pluginVersion = 3.2.1
diff --git a/src/main/kotlin/me/iru/process/JoinProcess.kt b/src/main/kotlin/me/iru/process/JoinProcess.kt
index 869969e..6d194e9 100644
--- a/src/main/kotlin/me/iru/process/JoinProcess.kt
+++ b/src/main/kotlin/me/iru/process/JoinProcess.kt
@@ -58,21 +58,23 @@ class JoinProcess(private val player: Player) {
     }
 
     private fun check() {
-        var i = 0
-        var task : BukkitTask? = null
-        task = authy.server.scheduler.runTaskTimer(authy, Runnable {
+        lateinit var messageTask : BukkitTask
+        messageTask = authy.server.scheduler.runTaskTimer(authy, Runnable {
             if(loginProcess.contains(player)) {
-                if(i == 10) {
-                    task!!.cancel()
-                    player.kickPlayer("${translations.getPrefix(PrefixType.ERROR)} ${translations.get("timedout_error")}")
-                    loginProcess.removePlayer(player)
-                } else {
-                    loginProcess.sendPleaseAuthMessage(player)
-                    i++
-                }
+                loginProcess.sendPleaseAuthMessage(player)
             }
-            else task!!.cancel()
+            else messageTask.cancel()
         },0L, 200L)
+
+        authy.server.scheduler.runTaskLater(authy, Runnable {
+            if(loginProcess.contains(player)) {
+                messageTask.cancel()
+                player.kickPlayer("${translations.getPrefix(PrefixType.ERROR)} ${translations.get("timedout_error")}")
+                loginProcess.removePlayer(player)
+            }
+        }, authy.config.getLong("timeout") * 20L)
     }
 
+
+
 }
\ No newline at end of file
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 961f536..e767580 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -1,5 +1,8 @@
 nameValidation: true
 
+# In seconds
+timeout: 60
+
 passwordValidation:
   minLength: 6
   maxLength: 32