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
@@ -60,8 +60,12 @@ public class AEItemDef
@Override
public boolean equals(Object obj)
{
AEItemDef def = (AEItemDef) obj;
return def.damageValue == damageValue && def.item == item && tagCompound == def.tagCompound;
if ( obj == null )
return false;
if ( getClass() != obj.getClass() )
return false;
AEItemDef other = (AEItemDef) obj;
return other.damageValue == damageValue && other.item == item && tagCompound == other.tagCompound;
}
public int getDamageValueHack(ItemStack is)