Merge branch 'architectury-1.17.1' into architectury-1.16.5

UnlikePaladin · Dec 29, 2023 · 0e59e8d · 0e59e8d
2 parents 504b6e2 + 06fa122
commit 0e59e8d
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/forge/PFMForgeBakedModel.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/forge/PFMForgeBakedModel.java
@@ -49,6 +49,9 @@ public IModelData getModelData(@NotNull BlockRenderView world, @NotNull BlockPos
 
     Map<Identifier, List<BakedQuad>> separatedQuads = new ConcurrentHashMap<>();
     public List<BakedQuad> getQuadsWithTexture(List<BakedQuad> quads, List<Sprite> toReplace, List<Sprite> replacements) {
+        if (quads == null)
+            return Collections.emptyList();
+
         if (replacements == null || toReplace == null || toReplace.size() != replacements.size()) {
             PaladinFurnitureMod.GENERAL_LOGGER.warn("Replacement list is not the same size or was null, skipping transformation");
             return quads;