keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix crash when texture loading throws RuntimeException without message

Browse source
This commit is contained in:
diesieben07 2015-05-20 17:43:52 +02:00
parent d3ab6d36a4
commit 1501f467cf
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fml/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java
View file

@ -99,6 +99,7 @@ import org.lwjgl.LWJGLUtil;
import org.lwjgl.input.Mouse; import org.lwjgl.input.Mouse;
import org.lwjgl.opengl.Display; import org.lwjgl.opengl.Display;
import com.google.common.base.Objects;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.google.common.base.Throwables; import com.google.common.base.Throwables;
import com.google.common.collect.BiMap; import com.google.common.collect.BiMap;
@ -906,7 +907,7 @@ public class FMLClientHandler implements IFMLSidedHandler
if (badType == null) if (badType == null)
{ {
badType = Sets.newHashSet(); badType = Sets.newHashSet();
brokenTextures.put(resourceLocation.getResourceDomain(), error, badType); brokenTextures.put(resourceLocation.getResourceDomain(), Objects.firstNonNull(error, "Unknown error"), badType);
} }
badType.add(resourceLocation); badType.add(resourceLocation);
} }