Fix stoppathing, add decay to cooldown

mindustry-antigrief · Nov 4, 2024 · 8f2e9de · 8f2e9de
1 parent 1aea5e8
commit 8f2e9de
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/core/src/mindustry/client/communication/CommandTransmission.kt b/core/src/mindustry/client/communication/CommandTransmission.kt
@@ -44,20 +44,22 @@ class CommandTransmission : Transmission {
         STOP_PATH(false, {
             val cert = Main.keyStorage.findTrusted(BigInteger(it.certSN))!!
             if (Navigation.currentlyFollowing != null) {
-                lastStopTime = Time.millis()
                 val oldPath = Navigation.currentlyFollowing
                 if (Main.keyStorage.builtInCerts.contains(cert)) {
                     val dialog = BaseDialog("@client.stoppath.stopped")
                     dialog.cont.add(Core.bundle.format("client.stoppath.bydev", cert.readableName))
                     dialog.buttons.button("@close", Icon.menu) { dialog.hide() }
                         .size(210f, 64f)
-                } else if (Time.timeSinceMillis(lastStopTime) > Time.toMinutes * (1 + numStopIgnores)) {
+                    dialog.show()
+                } else if (Time.timeSinceMillis(lastStopTime) > Time.toMinutes.toLong() * (1 + numStopIgnores)) {
+                    numStopIgnores -= Math.min(numStopIgnores, (Time.timeSinceMillis(lastStopTime) / Time.toMinutes.toLong()).toInt() - numStopIgnores - 1)
                     Vars.ui.showCustomConfirm("@client.stoppath.stopped",
                         Core.bundle.format("client.stoppath.by", Main.keyStorage.aliasOrName(cert)),
                         Core.bundle.get("client.stoppath.continue"), Core.bundle.get("client.stoppath.stop"),
                         { Navigation.follow(oldPath); numStopIgnores ++; }, {}
                     )
                 }
+                lastStopTime = Time.millis()
                 Navigation.stopFollowing()
             }
         }),