R3944Realms/CarryOn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 1.10

Browse Source
This commit is contained in:
Tschipp 2017-08-15 14:42:58 +02:00
parent d5ff19cdc2
commit 0bad034983
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/tschipp/carryon/common/handler/ModelOverridesHandler.java
View File

@ -102,7 +102,7 @@ public class ModelOverridesHandler
if (override.contains(":")) if (override.contains(":"))
modidOverride = override.replace(override.substring(override.indexOf(":")), ""); modidOverride = override.replace(override.substring(override.indexOf(":")), "");
if ((Loader.isModLoaded(modidOverride) && Loader.isModLoaded(modidToOverride)) || (modidOverride.equals("minecraft") && modidToOverride.equals("minecraft"))) if (!errored && (Loader.isModLoaded(modidOverride) && Loader.isModLoaded(modidToOverride)) || (modidOverride.equals("minecraft") && modidToOverride.equals("minecraft")))
{ {
int meta = StringParser.getMeta(toOverride); int meta = StringParser.getMeta(toOverride);
if (meta == 0) if (meta == 0)

2
src/main/java/tschipp/carryon/common/helper/StringParser.java
View File

@ -99,7 +99,7 @@ public class StringParser
Item item = getItem(string); Item item = getItem(string);
if(item == null) if(item == null)
return ItemStack.EMPTY; return null;
ItemStack stack = new ItemStack(item, 1, getMeta(string)); ItemStack stack = new ItemStack(item, 1, getMeta(string));
NBTTagCompound tag = getTagCompound(string); NBTTagCompound tag = getTagCompound(string);