Upstream
/
BlueMap
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Just copy propertyVariants if oldVariants would be empty. Fixes #124

This commit is contained in:
Blue (Lukas Rieger) 2020-12-19 19:59:51 +01:00
parent 9f0ea12f0b
commit 3172b6f64a
No known key found for this signature in database
GPG Key ID: 904C4995F9E1F800
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
BlueMapCore/src/main/java/de/bluecolored/bluemap/core/resourcepack/BlockStateResource.java
View File

@ -344,13 +344,18 @@ public class BlockStateResource {
}
// join variants
List<ForgeVariant> oldVariants = variants;
variants = new ArrayList<>(oldVariants.size() * propertyVariants.size());
for (ForgeVariant oldVariant : oldVariants) {
for (ForgeVariant addVariant : propertyVariants) {
variants.add(oldVariant.createMerge(addVariant));
if (variants.isEmpty()){
variants = propertyVariants;
} else {
List<ForgeVariant> oldVariants = variants;
variants = new ArrayList<>(oldVariants.size() * propertyVariants.size());
for (ForgeVariant oldVariant : oldVariants) {
for (ForgeVariant addVariant : propertyVariants) {
variants.add(oldVariant.createMerge(addVariant));
}
}
}
}
//create all possible property-variants