Added checks for null and equal class to .equals()

Also switched a check for null in OreHelper#sameOre to prevent null ==
null => true
This commit is contained in:
yueh
2014-09-29 12:39:40 +02:00
parent 640d888d13
commit fd7c1ff5f8
8 changed files with 63 additions and 27 deletions
@@ -54,7 +54,12 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
@Override
public boolean equals(Object obj)
{
return blk == ((Combo) obj).blk && meta == ((Combo) obj).meta;
if ( obj == null )
return false;
if ( getClass() != obj.getClass() )
return false;
Combo other = (Combo) obj;
return blk == other.blk && meta == other.meta;
}
}