From b4f68746137f9588ce1687b5728d889bcd1b640a Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 15 Mar 2021 18:07:54 +0000 Subject: [PATCH] Fix race condition in asset downloading --- .../minecraft/assets/MinecraftAssetsProvider.java | 7 ++----- 1 file changed, 2 insertions(+), 5 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 64722c60..ad005817 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 @@ -105,15 +105,12 @@ public class MinecraftAssetsProvider { } } else { executor.execute(() -> { - ProgressLogger progressLogger; + ProgressLogger progressLogger = loggers.pollFirst(); - if (loggers.isEmpty()) { + if (progressLogger == null) { //Create a new logger if we need one progressLogger = ProgressLogger.getProgressFactory(project, MinecraftAssetsProvider.class.getName()); progressLogger.start("Downloading assets...", "assets"); - } else { - // use a free logger if we can - progressLogger = loggers.pop(); } String assetName = entry.getKey();