Permalink
Browse files

Merge pull request #379 from boy0001/vector-fix

Vector and BlockVector should use the same hashCode
  • Loading branch information...
me4502 committed Feb 17, 2018
2 parents 2a3318b + 58094c7 commit b17f2b55d70be1dcafce79d7ecfd7e9de16dac8e
@@ -73,6 +73,11 @@ public BlockVector(double x, double y, double z) {
super(x, y, z);
}
@Override
public int hashCode() {
return ((int) x ^ ((int) z << 12)) ^ ((int) y << 24);
}
@Override
public boolean equals(Object obj) {
if (!(obj instanceof Vector)) {
@@ -84,13 +89,6 @@ public boolean equals(Object obj) {
}
@Override
public int hashCode() {
return ((int) x << 19) ^
((int) y << 12) ^
(int) z;
}
@Override
public BlockVector toBlockVector() {
return this;
@@ -69,6 +69,11 @@ public BlockVector2D(double x, double z) {
super(x, z);
}
@Override
public int hashCode() {
return ((int) x << 16) ^ (int) z;
}
@Override
public boolean equals(Object obj) {
if (!(obj instanceof Vector2D)) {
@@ -80,12 +85,6 @@ public boolean equals(Object obj) {
}
@Override
public int hashCode() {
return (Integer.valueOf((int) x).hashCode() >> 13) ^
Integer.valueOf((int) z).hashCode();
}
@Override
public BlockVector2D toBlockVector2D() {
return this;
@@ -789,12 +789,7 @@ public int compareTo(@Nullable Vector other) {
@Override
public int hashCode() {
int hash = 7;
hash = 79 * hash + (int) (Double.doubleToLongBits(this.x) ^ (Double.doubleToLongBits(this.x) >>> 32));
hash = 79 * hash + (int) (Double.doubleToLongBits(this.y) ^ (Double.doubleToLongBits(this.y) >>> 32));
hash = 79 * hash + (int) (Double.doubleToLongBits(this.z) ^ (Double.doubleToLongBits(this.z) >>> 32));
return hash;
return ((int) x ^ ((int) z << 12)) ^ ((int) y << 24);
}
@Override
@@ -627,8 +627,7 @@ public boolean equals(Object obj) {
@Override
public int hashCode() {
return ((new Double(x)).hashCode() >> 13) ^
(new Double(z)).hashCode();
return ((int) x << 16) ^ (int) z;
}
@Override

0 comments on commit b17f2b5

Please sign in to comment.