mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-22 21:20:12 +00:00
Fix merged mod resource pack not returning all resources with the same name when asked. Closes #9194
This commit is contained in:
3 files changed
+46
No files matched your search
@@ -10,6 +10,7 @@ import com.google.common.collect.ImmutableMap;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
@@ -123,6 +124,12 @@ public class DelegatingPackResources extends AbstractPackResources
|
||||
return null;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
public Collection<PackResources> getChildren()
|
||||
{
|
||||
return delegates;
|
||||
}
|
||||
|
||||
private List<PackResources> getCandidatePacks(PackType type, ResourceLocation location)
|
||||
{
|
||||
Map<String, List<PackResources>> map = type == PackType.CLIENT_RESOURCES ? namespacesAssets : namespacesData;
|
||||
|
||||
Reference in new issue
Block a user