From 9e90febd37f94ecd4f5bd8b0bd01128a683d06e3 Mon Sep 17 00:00:00 2001 From: RainWarrior Date: Sun, 8 Feb 2015 13:48:48 +0300 Subject: [PATCH] fixed NPE during loading of B3D models without textures/brushes. changed default B3D color to have full opacity. --- .../java/net/minecraftforge/client/model/b3d/B3DLoader.java | 2 +- .../java/net/minecraftforge/client/model/b3d/B3DModel.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java b/src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java index e0440ba6b..381124932 100644 --- a/src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java +++ b/src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java @@ -498,7 +498,7 @@ public class B3DLoader implements ICustomModelLoader } else { - put(e, 1, 1, 1, 0); + put(e, 1, 1, 1, 1); } break; case UV: diff --git a/src/main/java/net/minecraftforge/client/model/b3d/B3DModel.java b/src/main/java/net/minecraftforge/client/model/b3d/B3DModel.java index 6f12f37d3..d02022359 100644 --- a/src/main/java/net/minecraftforge/client/model/b3d/B3DModel.java +++ b/src/main/java/net/minecraftforge/client/model/b3d/B3DModel.java @@ -9,6 +9,7 @@ import java.nio.channels.FileChannel; import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.Deque; import java.util.HashMap; import java.util.HashSet; @@ -187,8 +188,8 @@ public class B3DModel throw new IOException("Unsupported major model version: " + ((float)version / 100)); if(version % 100 > this.version % 100) logger.warn(String.format("Minor version differnce in model: ", ((float)version / 100))); - List textures = null; - List brushes = null; + List textures = Collections.EMPTY_LIST; + List brushes = Collections.EMPTY_LIST; Node root = null; while(buf.hasRemaining()) {