Merge branch 'client-2060'

waicool20 · Oct 1, 2020 · b651db3 · b651db3
2 parents aa97aa9 + e70bb1f
commit b651db3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/kotlin/com/waicool20/wai2k/script/modules/combat/MapRunner.kt b/src/main/kotlin/com/waicool20/wai2k/script/modules/combat/MapRunner.kt
@@ -270,7 +270,7 @@ abstract class MapRunner(
         logger.info("Waiting for turn to end, expected battles: $battles")
         var battlesPassed = 0
         try {
-            withTimeout(battles * profile.combat.battleTimeout.toLong()) {
+            withTimeout(battles * profile.combat.battleTimeout * 1000L) {
                 while (isActive && battlesPassed < battles) {
                     if (isInBattle()) {
                         clickThroughBattle()