From efb3c6ef866862770175a4d4b6c2ba1bd12bfe36 Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Thu, 24 May 2018 14:57:29 +0300 Subject: [PATCH] Disabled rest of the update system --- Plan/dependency-reduced-pom.xml | 14 +++++++++----- .../plan/command/commands/UpdateCommand.java | 3 ++- .../plan/system/update/VersionCheckSystem.java | 6 ++++-- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/Plan/dependency-reduced-pom.xml b/Plan/dependency-reduced-pom.xml index 30e597272..8090dff0b 100644 --- a/Plan/dependency-reduced-pom.xml +++ b/Plan/dependency-reduced-pom.xml @@ -174,7 +174,11 @@ org.slf4j - asm-all + asm + org.ow2.asm + + + asm-commons org.ow2.asm @@ -313,10 +317,6 @@ flow-noise com.flowpowered - - asm - org.ow2.asm - slf4j-api org.slf4j @@ -325,6 +325,10 @@ jsr305 com.google.code.findbugs + + asm + org.ow2.asm + gson com.google.code.gson diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/UpdateCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/UpdateCommand.java index 10d2371be..a12ffd7ea 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/UpdateCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/UpdateCommand.java @@ -112,7 +112,8 @@ public class UpdateCommand extends CommandNode { sender.sendMessage("Checking that all servers are online.."); if (!checkNetworkStatus(sender)) { sender.sendMessage("§cNot all servers were online or accessible, you can still update available servers using /plan -update -force"); - if (args.length > 1 && "-force".equals(args[1])) { + // If -force, continue, otherwise return. + if (args.length < 2 || !"-force".equals(args[1])) { return; } } diff --git a/Plan/src/main/java/com/djrapitops/plan/system/update/VersionCheckSystem.java b/Plan/src/main/java/com/djrapitops/plan/system/update/VersionCheckSystem.java index b52f9f21c..bf6465161 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/update/VersionCheckSystem.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/update/VersionCheckSystem.java @@ -57,8 +57,10 @@ public class VersionCheckSystem implements SubSystem { if (Version.isNewVersionAvailable(new Version(currentVersion), newestVersion.getVersion())) { newVersionAvailable = newestVersion; String notification = - "New Release (" + newestVersion.getVersion().toString() + ") is available and can be updated " + - "to using update subcommand." + (newestVersion.isRelease() ? "" : " This is a DEV release."); + "New Release (" + newestVersion.getVersion().toString() + ") is available " + +// "and can be updated to using update subcommand." + + newestVersion.getChangeLogUrl() + + (newestVersion.isRelease() ? "" : " This is a DEV release."); Log.infoColor("§a----------------------------------------"); Log.infoColor("§a" + notification); Log.infoColor("§a----------------------------------------");