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

Merge pull request #1886 from diesieben07/texture-load-crash 

Fix crash when texture loading throws RuntimeException without message
This commit is contained in:
LexManos 2015-05-20 12:19:18 -07:00
parent d3ab6d36a4 1501f467cf
commit 61b2929ae6
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.opengl.Display;
import com.google.common.base.Objects;
import com.google.common.base.Strings;
import com.google.common.base.Throwables;
import com.google.common.collect.BiMap;
@ -906,7 +907,7 @@ public class FMLClientHandler implements IFMLSidedHandler
if (badType == null)
{
badType = Sets.newHashSet();
brokenTextures.put(resourceLocation.getResourceDomain(), error, badType);
brokenTextures.put(resourceLocation.getResourceDomain(), Objects.firstNonNull(error, "Unknown error"), badType);
}
badType.add(resourceLocation);
}