Refactor plugin update and restart logic

Replaces the updateAndRestart method with updatePlugin in AutoViaUpdater for BungeeCord, Spigot, and Velocity. The restart logic is now centralized and only triggers if any plugin was updated, improving code clarity and reducing duplication.

Author: NewAmazingPVP

src/main/java/bungeecord/AutoViaUpdater.java

@@ -112,14 +112,21 @@ public void checkUpdateVias() {
             if (getProxy().getPluginManager().getPlugin("ViaRewind") == null) {
                 updateBuildNumber("ViaRewind", -1);
             }
-            if (isViaVersionEnabled) {
-                updateAndRestart("ViaVersion", isViaVersionSnapshot, isViaVersionDev, isViaVersionJava8);
+            boolean shouldRestart = false;
+            if (isViaVersionEnabled && updatePlugin("ViaVersion", isViaVersionSnapshot, isViaVersionDev, isViaVersionJava8)) {
+                shouldRestart = true;
             }
-            if (isViaBackwardsEnabled) {
-                updateAndRestart("ViaBackwards", isViaBackwardsSnapshot, isViaBackwardsDev, isViaBackwardsJava8);
+            if (isViaBackwardsEnabled && updatePlugin("ViaBackwards", isViaBackwardsSnapshot, isViaBackwardsDev, isViaBackwardsJava8)) {
+                shouldRestart = true;
             }
-            if (isViaRewindEnabled) {
-                updateAndRestart("ViaRewind", isViaRewindSnapshot, isViaRewindDev, isViaRewindJava8);
+            if (isViaRewindEnabled && updatePlugin("ViaRewind", isViaRewindSnapshot, isViaRewindDev, isViaRewindJava8)) {
+                shouldRestart = true;
+            }
+            if (shouldRestart && config.getBoolean("AutoRestart")) {
+                String raw = config.getString("AutoRestart-Message");
+                String colored = net.md_5.bungee.api.ChatColor.translateAlternateColorCodes('&', raw == null ? "" : raw);
+                getProxy().broadcast(colored);
+                getProxy().getScheduler().schedule(this, () -> getProxy().stop(), config.getLong("AutoRestart-Delay"), TimeUnit.SECONDS);
             }
         } catch (IOException e) {
             e.printStackTrace();
@@ -128,13 +135,8 @@ public void checkUpdateVias() {
         }
     }
 
-    private void updateAndRestart(String pluginName, boolean isSnapshot, boolean isDev, boolean isJava8) throws IOException {
-        if (updateVia(pluginName, getDataFolder().getParent(), isSnapshot, isDev, isJava8) && config.getBoolean("AutoRestart")) {
-            String raw = config.getString("AutoRestart-Message");
-            String colored = net.md_5.bungee.api.ChatColor.translateAlternateColorCodes('&', raw == null ? "" : raw);
-            getProxy().broadcast(colored);
-            getProxy().getScheduler().schedule(this, () -> getProxy().stop(), config.getLong("AutoRestart-Delay"), TimeUnit.SECONDS);
-        }
+    private boolean updatePlugin(String pluginName, boolean isSnapshot, boolean isDev, boolean isJava8) throws IOException {
+        return updateVia(pluginName, getDataFolder().getParent(), isSnapshot, isDev, isJava8);
     }
 
     public class UpdateCommand extends Command {

src/main/java/spigot/AutoViaUpdater.java

@@ -110,17 +110,24 @@ public void checkUpdateVias() {
             if (!hasVB.get()) updateBuildNumber("ViaBackwards", -1);
             if (!hasVR.get()) updateBuildNumber("ViaRewind", -1);
             if (!hasVRL.get()) updateBuildNumber("ViaRewind%20Legacy%20Support", -1);
-            if (isViaVersionEnabled) {
-                updateAndRestart("ViaVersion", isViaVersionSnapshot, isViaVersionDev, isViaVersionJava8);
+            boolean shouldRestart = false;
+            if (isViaVersionEnabled && updatePlugin("ViaVersion", isViaVersionSnapshot, isViaVersionDev, isViaVersionJava8)) {
+                shouldRestart = true;
             }
-            if (isViaBackwardsEnabled) {
-                updateAndRestart("ViaBackwards", isViaBackwardsSnapshot, isViaBackwardsDev, isViaBackwardsJava8);
+            if (isViaBackwardsEnabled && updatePlugin("ViaBackwards", isViaBackwardsSnapshot, isViaBackwardsDev, isViaBackwardsJava8)) {
+                shouldRestart = true;
             }
-            if (isViaRewindEnabled) {
-                updateAndRestart("ViaRewind", isViaRewindSnapshot, isViaRewindDev, isViaRewindJava8);
+            if (isViaRewindEnabled && updatePlugin("ViaRewind", isViaRewindSnapshot, isViaRewindDev, isViaRewindJava8)) {
+                shouldRestart = true;
             }
-            if (isViaRewindLegacyEnabled) {
-                updateAndRestart("ViaRewind%20Legacy%20Support", isViaRewindLegacySnapshot, isViaRewindLegacyDev, false);
+            if (isViaRewindLegacyEnabled && updatePlugin("ViaRewind%20Legacy%20Support", isViaRewindLegacySnapshot, isViaRewindLegacyDev, false)) {
+                shouldRestart = true;
+            }
+            if (shouldRestart && config.getBoolean("AutoRestart")) {
+                String raw = config.getString("AutoRestart-Message");
+                String msg = org.bukkit.ChatColor.translateAlternateColorCodes('&', raw == null ? "" : raw);
+                SchedulerAdapter.runGlobal(this, () -> Bukkit.broadcastMessage(msg));
+                SchedulerAdapter.runGlobalDelayed(this, Bukkit::shutdown, config.getLong("AutoRestart-Delay") * 20L);
             }
         } catch (IOException e) {
             e.printStackTrace();
@@ -129,13 +136,8 @@ public void checkUpdateVias() {
         }
     }
 
-    private void updateAndRestart(String pluginName, boolean isSnapshot, boolean isDev, boolean isJava8) throws IOException {
-        if (updateVia(pluginName, getDataFolder().getParent(), isSnapshot, isDev, isJava8) && getConfig().getBoolean("AutoRestart")) {
-            String raw = config.getString("AutoRestart-Message");
-            String msg = org.bukkit.ChatColor.translateAlternateColorCodes('&', raw == null ? "" : raw);
-            SchedulerAdapter.runGlobal(this, () -> Bukkit.broadcastMessage(msg));
-            SchedulerAdapter.runGlobalDelayed(this, Bukkit::shutdown, config.getLong("AutoRestart-Delay") * 20L);
-        }
+    private boolean updatePlugin(String pluginName, boolean isSnapshot, boolean isDev, boolean isJava8) throws IOException {
+        return updateVia(pluginName, getDataFolder().getParent(), isSnapshot, isDev, isJava8);
     }
 
     public void loadConfiguration() {

src/main/java/velocity/AutoViaUpdater.java

@@ -130,14 +130,23 @@ public void checkUpdateVias() {
             if (proxy.getPluginManager().getPlugin("viarewind").orElse(null) == null) {
                 updateBuildNumber("ViaRewind", -1);
             }
-            if (isViaVersionEnabled) {
-                updateAndRestart("ViaVersion", isViaVersionSnapshot, isViaVersionDev, isViaVersionJava8);
+            boolean shouldRestart = false;
+            if (isViaVersionEnabled && updatePlugin("ViaVersion", isViaVersionSnapshot, isViaVersionDev, isViaVersionJava8)) {
+                shouldRestart = true;
             }
-            if (isViaBackwardsEnabled) {
-                updateAndRestart("ViaBackwards", isViaBackwardsSnapshot, isViaBackwardsDev, isViaBackwardsJava8);
+            if (isViaBackwardsEnabled && updatePlugin("ViaBackwards", isViaBackwardsSnapshot, isViaBackwardsDev, isViaBackwardsJava8)) {
+                shouldRestart = true;
             }
-            if (isViaRewindEnabled) {
-                updateAndRestart("ViaRewind", isViaRewindSnapshot, isViaRewindDev, isViaRewindJava8);
+            if (isViaRewindEnabled && updatePlugin("ViaRewind", isViaRewindSnapshot, isViaRewindDev, isViaRewindJava8)) {
+                shouldRestart = true;
+            }
+            if (shouldRestart && config.getBoolean("AutoRestart")) {
+                String raw = config.getString("AutoRestart-Message");
+                Component msg = LegacyComponentSerializer.legacyAmpersand().deserialize(raw == null ? "" : raw);
+                proxy.sendMessage(msg);
+                proxy.getScheduler().buildTask(this, proxy::shutdown)
+                        .delay(Duration.ofSeconds(config.getLong("AutoRestart-Delay")))
+                        .schedule();
             }
         } catch (IOException e) {
             e.printStackTrace();
@@ -146,15 +155,8 @@ public void checkUpdateVias() {
         }
     }
 
-    private void updateAndRestart(String pluginName, boolean isSnapshot, boolean isDev, boolean isJava8) throws IOException {
-        if (updateVia(pluginName, dataDirectory.getParent().toString(), isSnapshot, isDev, isJava8) && config.getBoolean("AutoRestart")) {
-            String raw = config.getString("AutoRestart-Message");
-            Component msg = LegacyComponentSerializer.legacyAmpersand().deserialize(raw == null ? "" : raw);
-            proxy.sendMessage(msg);
-            proxy.getScheduler().buildTask(this, proxy::shutdown)
-                    .delay(Duration.ofSeconds(config.getLong("AutoRestart-Delay")))
-                    .schedule();
-        }
+    private boolean updatePlugin(String pluginName, boolean isSnapshot, boolean isDev, boolean isJava8) throws IOException {
+        return updateVia(pluginName, dataDirectory.getParent().toString(), isSnapshot, isDev, isJava8);
     }
 
     private Toml loadConfig(Path path) {