From 3172b6f64a4d9c44230f53c7c654a99411b92847 Mon Sep 17 00:00:00 2001 From: "Blue (Lukas Rieger)" Date: Sat, 19 Dec 2020 19:59:51 +0100 Subject: [PATCH] Just copy propertyVariants if oldVariants would be empty. Fixes #124 --- .../core/resourcepack/BlockStateResource.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/resourcepack/BlockStateResource.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/resourcepack/BlockStateResource.java index 1d95e1d8..54ad4939 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/resourcepack/BlockStateResource.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/resourcepack/BlockStateResource.java @@ -344,13 +344,18 @@ private BlockStateResource buildForge(ConfigurationNode config, String blockstat } // join variants - List 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 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