Fixed NullPointerException when a version not exists.

HMCL-dev · Mar 15, 2016 · f6d5dd5 · f6d5dd5
1 parent cafcf45
commit f6d5dd5
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/...src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/MinecraftAssetService.java b/...src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/MinecraftAssetService.java
@@ -56,7 +56,8 @@ public Task downloadAssets(final String mcVersion) {
     }
 
     public Task downloadAssets(final MinecraftVersion mv) {
-        Utils.requireNonNull(mv);
+        if (mv == null)
+            return null;
         return new TaskInfo("Download Assets") {
             Collection<Task> afters = new HashSet<>();
 

diff --git a/...in/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftDownloadService.java b/...in/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftDownloadService.java
@@ -55,7 +55,7 @@ public List<DownloadLibraryJob> getDownloadLibraries(MinecraftVersion mv) throws
             return downloadLibraries;
         MinecraftVersion v = mv.resolve(service.version());
         for (IMinecraftLibrary l : v.getLibraries())
-            if (l != null && l.allow()) {
+            if (l != null && l.allow() && l.getDownloadInfo() != null) {
                 File ff = l.getFilePath(service.baseDirectory());
                 if (!ff.exists()) {
                     String libURL = l.getDownloadInfo().getUrl(service.getDownloadType());

diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java
@@ -89,6 +89,8 @@ public boolean isRequiredToUnzip() {
 
     public String formatName() {
         String[] s = name.split(":");
+        if (s.length < 3)
+            return null;
         StringBuilder sb = new StringBuilder(s[0].replace('.', '/')).append('/').append(s[1]).append('/').append(s[2]).append('/').append(s[1]).append('-').append(s[2]);
         if (natives != null)
             sb.append('-').append(getNative());
@@ -120,8 +122,11 @@ public LibraryDownloadInfo getDownloadInfo() {
             downloads.artifact = info = new LibraryDownloadInfo();
         else
             info = downloads.artifact;
-        if (StrUtils.isBlank(info.path))
+        if (StrUtils.isBlank(info.path)) {
             info.path = formatName();
+            if (info.path == null)
+                return null;
+        }
         info.forgeURL = this.url;
         return info;
     }

diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/CrashReporter.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/CrashReporter.java
@@ -48,7 +48,7 @@ public class CrashReporter implements Thread.UncaughtExceptionHandler {
             put("MessageBox", "");
             put("AWTError", "");
             put("JFileChooser", "Has your operating system been installed completely or is a ghost system? ");
-            put("JceSecurity", "Has your operating system been installed completely or is a ghost system? ");
+            put("Jce", "Has your operating system been installed completely or is a ghost system? ");
             put("couldn't create component peer", "Fucking computer!");
             put("sun.awt.shell.Win32ShellFolder2", "crash.user_fault");
             put("UnsatisfiedLinkError", "crash.user_fault");

diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskWindow.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskWindow.java
@@ -322,7 +322,8 @@ public static class TaskWindowFactory {
         boolean flag;
 
         public TaskWindowFactory append(Task t) {
-            ll.add(t);
+            if (t != null)
+                ll.add(t);
             return this;
         }