fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent Materials from crashing if they are disabled.

Browse Source
This commit is contained in:
AlgorithmX2
2014-04-27 23:50:26 -05:00
parent 1d5e5679b3
commit c72ce5ba06
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
items/materials/ItemMaterial.java
+7 -2
View File
@@ -25,6 +25,7 @@ import appeng.api.config.Upgrades;
import appeng.api.implementations.items.IItemGroup; import appeng.api.implementations.items.IItemGroup;
import appeng.api.implementations.items.IStorageComponent; import appeng.api.implementations.items.IStorageComponent;
import appeng.api.implementations.items.IUpgradeModule; import appeng.api.implementations.items.IUpgradeModule;
import appeng.client.texture.MissingIcon;
import appeng.core.AEConfig; import appeng.core.AEConfig;
import appeng.core.features.AEFeature; import appeng.core.features.AEFeature;
import appeng.core.features.AEFeatureHandler; import appeng.core.features.AEFeatureHandler;
@@ -156,13 +157,17 @@ public class ItemMaterial extends AEBaseItem implements IStorageComponent, IUpgr
public MaterialType getTypeByStack(ItemStack is) public MaterialType getTypeByStack(ItemStack is)
{ {
return dmgToMaterial.get( is.getItemDamage() ); if ( dmgToMaterial.containsKey( is.getItemDamage() ) )
return dmgToMaterial.get( is.getItemDamage() );
return null;
} }
@Override @Override
public IIcon getIconFromDamage(int dmg) public IIcon getIconFromDamage(int dmg)
{ {
return dmgToMaterial.get( dmg ).IIcon; if ( dmgToMaterial.containsKey( dmg ) )
return dmgToMaterial.get( dmg ).IIcon;
return new MissingIcon( this );
} }
private String nameOf(ItemStack is) private String nameOf(ItemStack is)