keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Fixed wrong import.

This commit is contained in:
RainWarrior 2015-12-30 16:14:27 +03:00
parent 10658f682e
commit 23a2316157
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/net/minecraftforge/client/model/obj/OBJModel.java
View File

@ -11,7 +11,6 @@ import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.regex.Pattern;
@ -54,6 +53,7 @@ import org.apache.commons.lang3.tuple.Pair;
import com.google.common.base.Charsets;
import com.google.common.base.Function;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
@ -1244,7 +1244,7 @@ public class OBJModel implements IRetexturableModel, IModelCustomData
@Override
public int hashCode()
{
return Objects.hash(visibilityMap, parent, operation);
return Objects.hashCode(visibilityMap, parent, operation);
}
@Override
@ -1257,8 +1257,8 @@ public class OBJModel implements IRetexturableModel, IModelCustomData
if (getClass() != obj.getClass())
return false;
OBJState other = (OBJState) obj;
return Objects.equals(visibilityMap, other.visibilityMap) &&
Objects.equals(parent, other.parent) &&
return Objects.equal(visibilityMap, other.visibilityMap) &&
Objects.equal(parent, other.parent) &&
operation == other.operation;
}