diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-02-09 09:20:16 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-02-09 09:20:47 +0800 |
| commit | 10686aaed9970003378686918bfc9f9ed0519493 (patch) | |
| tree | 46421b09a6097804c0210e9715cfda5fbe065c52 /src/main/java/net/fabricmc/loom | |
| parent | b8e27f3d9b94d5ce06ba3fd2b31b9f911c3efc4a (diff) | |
| parent | b8058c693d148277ff4182098db15608f7ac72ff (diff) | |
| download | architectury-loom-10686aaed9970003378686918bfc9f9ed0519493.tar.gz architectury-loom-10686aaed9970003378686918bfc9f9ed0519493.tar.bz2 architectury-loom-10686aaed9970003378686918bfc9f9ed0519493.zip | |
Merge remote-tracking branch 'FabricMC/dev/0.6' into dev/0.6-forge
# Conflicts:
# src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java
Diffstat (limited to 'src/main/java/net/fabricmc/loom')
| -rw-r--r-- | src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java index 5709e38c..cdf0c618 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java @@ -29,8 +29,8 @@ import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import java.net.URL; -import java.util.HashMap; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; @@ -90,7 +90,7 @@ public class MinecraftAssetsProvider { } Gson gson = new Gson(); - Map<String, String> checksumInfos = new HashMap<>(); + Map<String, String> checksumInfos = new ConcurrentHashMap<>(); if (checksumInfo.exists()) { try (FileReader reader = new FileReader(checksumInfo)) { |