Permalink
Browse files

Vector and BlockVector should use the same hashCode

For example, the getChunks method returns a Set<Vector2D> which is
actually comprised of BlockVector2D, so using set.contains(some vector)
will always return false.

There's unlikely to be multiple entities on the same block, or above
y=256, so using the int coords is better.
  • Loading branch information...
boy0001 committed Jan 10, 2017
1 parent 9f24f84 commit ad7fdd19fb5588411939d1e8e78aeb74f2f7f77d
@@ -84,13 +84,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;
@@ -80,12 +80,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 ad7fdd1

Please sign in to comment.