From 0e84d4f914211beeca5b3653fd45d7c8535a53ac Mon Sep 17 00:00:00 2001 From: "Lukas Rieger (Blue)" Date: Tue, 23 Aug 2022 19:45:39 +0200 Subject: [PATCH] Fix (rarely) possible null-values in textures.json --- .../de/bluecolored/bluemap/core/map/TextureGallery.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/map/TextureGallery.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/map/TextureGallery.java index 28a0bf5c..6aa7e842 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/map/TextureGallery.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/map/TextureGallery.java @@ -9,6 +9,7 @@ import org.jetbrains.annotations.Nullable; import java.io.*; +import java.util.Arrays; import java.util.HashMap; import java.util.Map; @@ -41,10 +42,11 @@ public synchronized void put(ResourcePack resourcePack) { public void writeTexturesFile(ResourcePack resourcePack, OutputStream out) throws IOException { Texture[] textures = new Texture[nextId]; + Arrays.fill(textures, Texture.MISSING); + ordinalMap.forEach((textureResourcePath, ordinal) -> { Texture texture = textureResourcePath.getResource(resourcePack::getTexture); - if (texture == null) texture = Texture.MISSING; - textures[ordinal] = texture; + if (texture != null) textures[ordinal] = texture; }); try (Writer writer = new OutputStreamWriter(out)) {