R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into 1.18

Browse Source
This commit is contained in:
embeddedt 2023-05-08 09:25:51 -04:00
commit 558ced7497
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/src/main/java/org/embeddedt/modernfix/resources/PackResourcesCacheEngine.java
View File

@ -31,7 +31,7 @@ public class PackResourcesCacheEngine {
private final Map<PackType, Set<String>> namespacesByType; private final Map<PackType, Set<String>> namespacesByType;
private final Set<CachedResourcePath> containedPaths; private final Set<CachedResourcePath> containedPaths;
private final EnumMap<PackType, Map<String, List<CachedResourcePath>>> resourceListings; private final EnumMap<PackType, Map<String, List<CachedResourcePath>>> resourceListings;
private CompletableFuture<Void> cacheFuture; private volatile CompletableFuture<Void> cacheFuture;
public PackResourcesCacheEngine(Function<PackType, Set<String>> namespacesRetriever, BiFunction<PackType, String, Path> basePathRetriever) { public PackResourcesCacheEngine(Function<PackType, Set<String>> namespacesRetriever, BiFunction<PackType, String, Path> basePathRetriever) {
this.namespacesByType = new EnumMap<>(PackType.class); this.namespacesByType = new EnumMap<>(PackType.class);
@ -114,8 +114,12 @@ public class PackResourcesCacheEngine {
private void awaitLoad() { private void awaitLoad() {
if(this.cacheFuture != null) { if(this.cacheFuture != null) {
this.cacheFuture.join(); synchronized (this) {
this.cacheFuture = null; if(this.cacheFuture != null) {
this.cacheFuture.join();
this.cacheFuture = null;
}
}
} }
} }