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
@@ -38,8 +38,12 @@ public class CompassManager
@Override
public boolean equals(Object obj)
{
CompassRequest b = (CompassRequest) obj;
return attunement == b.attunement && cx == b.cx && cdy == b.cdy && cz == b.cz;
if ( obj == null )
return false;
if ( getClass() != obj.getClass() )
return false;
CompassRequest other = (CompassRequest) obj;
return attunement == other.attunement && cx == other.cx && cdy == other.cdy && cz == other.cz;
}
}