diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/game/DefaultGameRepository.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/game/DefaultGameRepository.java index c0fbf24ad2..0478edecdb 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/game/DefaultGameRepository.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/game/DefaultGameRepository.java @@ -68,24 +68,24 @@ public class DefaultGameRepository implements GameRepository { @Override public boolean hasVersion(String id) { - return id != null && versions.containsKey(id); + return id != null && versions != null && versions.containsKey(id); } @Override public Version getVersion(String id) { if (!hasVersion(id)) - throw new VersionNotFoundException("Version '" + id + "' does not exist in " + versions.keySet() + "."); + throw new VersionNotFoundException("Version '" + id + "' does not exist in " + (versions == null ? "[]" : versions.keySet()) + "."); return versions.get(id); } @Override public int getVersionCount() { - return versions.size(); + return versions == null ? 0 : versions.size(); } @Override public Collection getVersions() { - return versions.values(); + return versions == null ? Collections.emptySet() : versions.values(); } @Override