From 33ec02af58a34419eaf7902f7415bf8491827305 Mon Sep 17 00:00:00 2001
From: devoxin <lukel9914@gmail.com>
Date: Tue, 6 Feb 2024 15:13:56 +0000
Subject: [PATCH] apply feedback

---
 .gitignore                                               | 3 ++-
 .../main/java/lavalink/server/bootstrap/PluginManager.kt | 9 ++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index d9ac554cd..703911c04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,4 +21,5 @@ gradle.properties
 application.yml
 LavalinkServer/plugins
 .cache/
-site/
\ No newline at end of file
+site/
+.DS_Store
\ No newline at end of file
diff --git a/LavalinkServer/src/main/java/lavalink/server/bootstrap/PluginManager.kt b/LavalinkServer/src/main/java/lavalink/server/bootstrap/PluginManager.kt
index f822887c1..5a1115c78 100644
--- a/LavalinkServer/src/main/java/lavalink/server/bootstrap/PluginManager.kt
+++ b/LavalinkServer/src/main/java/lavalink/server/bootstrap/PluginManager.kt
@@ -41,6 +41,7 @@ class PluginManager(val config: PluginsConfig) {
                     loadPluginManifests(jar).map { manifest -> PluginJar(manifest, file) }
                 }
             }
+            ?.onEach { log.info("Found plugin '${it.manifest.name}' version ${it.manifest.version}") }
             ?: return
 
         val declarations = config.plugins.map { declaration ->
@@ -57,19 +58,17 @@ class PluginManager(val config: PluginsConfig) {
 
         for (declaration in declarations) {
             val jars = pluginJars.filter { it.manifest.name == declaration.name }
-            var hasCurrentVersion = false
+            val hasCurrentVersion = jars.any { it.manifest.version == declaration.version }
 
             for (jar in jars) {
                 if (jar.manifest.version == declaration.version) {
-                    hasCurrentVersion = true
-                    // Short-circuit to avoid cleaning up the jar for the current version.
-                    // The loop continues, to clean up any other possibly-unwanted jars.
+                    // Don't clean up the jar if it's a current version.
                     continue
                 }
 
                 // Delete versions of the plugin that aren't the same as declared version.
                 if (!jar.file.delete()) throw RuntimeException("Failed to delete ${jar.file.path}")
-                log.info("Cleaned up ${jar.file.path}")
+                log.info("Deleted ${jar.file.path} (old version: ${jar.manifest.version})")
             }
 
             if (!hasCurrentVersion) {