fix conflict detection

Signed-off-by: isXander <[email protected]>
isXander · Aug 23, 2022 · 5dbcd10 · 5dbcd10
1 parent c17ebd4
commit 5dbcd10
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -17,7 +17,7 @@ plugins {
 }
 
 group = "dev.isxander"
-version = "2.4.0"
+version = "2.4.1"
 
 repositories {
     mavenCentral()

diff --git a/changelogs/2.4.1.md b/changelogs/2.4.1.md
@@ -0,0 +1 @@
+- Fix conflict detection
diff --git a/src/main/kotlin/dev/isxander/zoomify/Zoomify.kt b/src/main/kotlin/dev/isxander/zoomify/Zoomify.kt
@@ -142,6 +142,7 @@ object Zoomify : ClientModInitializer {
 
     fun onGameFinishedLoading() {
         if (ZoomifySettings.firstLaunch) {
+            LOGGER.info("Zoomify detected first launch! Detecting conflicting keybindings!")
             detectConflictingToast()
         }
     }
@@ -177,7 +178,7 @@ object Zoomify : ClientModInitializer {
         if (zoomKey.isUnbound)
             return
 
-        if (client.options.allKeys.any { it.equals(zoomKey) }) {
+        if (client.options.allKeys.any { it != zoomKey && it.equals(zoomKey) }) {
             val toast = SystemToast.create(
                 client,
                 SystemToast.Type.CHAT_PREVIEW_WARNING,