Fix incorrect merge
This commit is contained in:
parent
44d178bb89
commit
dcd37391fe
|
|
@ -74,7 +74,7 @@ public abstract class PathResourcePackMixin {
|
||||||
if(!listing.getFileName().endsWith(".mcmeta")) {
|
if(!listing.getFileName().endsWith(".mcmeta")) {
|
||||||
rootListingPaths.add(listing);
|
rootListingPaths.add(listing);
|
||||||
}
|
}
|
||||||
this.containedPaths.add(new CachedResourcePath(new String[] { type.getDirectory(), namespace }, listing));
|
containedPaths.add(new CachedResourcePath(new String[] { type.getDirectory(), namespace }, listing));
|
||||||
});
|
});
|
||||||
rootListingPaths.trimToSize();
|
rootListingPaths.trimToSize();
|
||||||
rootListingForNamespaces.put(namespace, rootListingPaths);
|
rootListingForNamespaces.put(namespace, rootListingPaths);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user