diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/DefaultGameBuilder.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/DefaultGameBuilder.java index bd480a51b5..c6289d8352 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/DefaultGameBuilder.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/DefaultGameBuilder.java @@ -111,7 +111,7 @@ public class DefaultGameBuilder extends GameBuilder { GameInstanceManifest.Resolved resolved = draft.getBaseSnapshot().resolve(manifest); return new GameDownloadTask(dependencyManager, resolved.launchManifest()) .thenApplyAsync(minecraftJar -> { - draft.put(resolved.standaloneManifest()); + draft.put(resolved.launchManifest().withPatches(manifest.patches())); draft.putPrimaryJar(id, minecraftJar); return draft.commit().getInstance(id); }); 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 aa721d1c6a..d24a7655b9 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/game/DefaultGameRepository.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/game/DefaultGameRepository.java @@ -638,8 +638,7 @@ public abstract class DefaultGameRepository implements GameRepository { return Task.supplyAsync(() -> { GameRepositoryDraft draft = openDraft(); active.set(draft); - GameInstance publishedInstance = getInstance(instanceId); - return publishedInstance; + return draft.getBaseSnapshot().getInstance(instanceId); }) .thenComposeAsync(updater) .thenApplyAsync(manifest -> { diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/game/DefaultGameRepositoryDraft.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/game/DefaultGameRepositoryDraft.java index 3ad55902e9..48ccdf7332 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/game/DefaultGameRepositoryDraft.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/game/DefaultGameRepositoryDraft.java @@ -91,6 +91,7 @@ public final class DefaultGameRepositoryDraft implements GameRepositoryDraft { return repository; } + @Override public DefaultGameRepositorySnapshot getBaseSnapshot() { return baseSnapshot; } diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/game/GameRepositoryDraft.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/game/GameRepositoryDraft.java index 6093e13c38..83ebb13d6b 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/game/GameRepositoryDraft.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/game/GameRepositoryDraft.java @@ -63,6 +63,8 @@ public interface GameRepositoryDraft extends AutoCloseable { /// @return the repository GameRepository getRepository(); + GameRepositorySnapshot getBaseSnapshot(); + /// Returns this draft's lifecycle state. /// /// @return the current state