tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Fixed a few models, fixed a crash

Browse source
This commit is contained in:
Aidan C. Brady 2015-03-27 13:09:41 -04:00
parent fba7fb34f0
commit 543d45d57a
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/mekanism/client/render/block/CTMRenderingHandler.java
View file

@ -75,6 +75,8 @@ public class CTMRenderingHandler implements ISimpleBlockRenderingHandler
return true;
}
return false;
}
return rendererOld.renderStandardBlock(block, x, y, z);

4
src/main/java/mekanism/common/recipe/MekanismRecipe.java
View file

@ -220,7 +220,9 @@ public class MekanismRecipe implements IRecipe
{
if(entry != null && entry.getKey() != null && entry.getValue() != null)
{
upgrades.put(entry.getKey(), Math.min(entry.getKey().getMax(), upgrades.get(entry.getKey()) + entry.getValue()));
Integer val = upgrades.get(entry.getKey());
upgrades.put(entry.getKey(), Math.min(entry.getKey().getMax(), (val != null ? val : 0) + entry.getValue()));
}
}
}