Merge pull request #379 from boy0001/vector-fix

Vector and BlockVector should use the same hashCode

worldedit-core/src/main/java/com/sk89q/worldedit/BlockVector.java

@@ -73,6 +73,11 @@ public class BlockVector extends Vector {
         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 class BlockVector extends Vector {
 
     }
 
-    @Override
-    public int hashCode() {
-        return ((int) x << 19) ^
-                ((int) y << 12) ^
-                (int) z;
-    }
-
     @Override
     public BlockVector toBlockVector() {
         return this;

worldedit-core/src/main/java/com/sk89q/worldedit/BlockVector2D.java

@@ -69,6 +69,11 @@ public class BlockVector2D extends Vector2D {
         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 class BlockVector2D extends Vector2D {
 
     }
 
-    @Override
-    public int hashCode() {
-        return (Integer.valueOf((int) x).hashCode() >> 13) ^
-                Integer.valueOf((int) z).hashCode();
-    }
-
     @Override
     public BlockVector2D toBlockVector2D() {
         return this;

worldedit-core/src/main/java/com/sk89q/worldedit/Vector.java

@@ -789,12 +789,7 @@ public class Vector implements Comparable<Vector> {
 
     @Override
     public int hashCode() {
-        int hash = 7;
+        return ((int) x ^ ((int) z << 12)) ^ ((int) y << 24);
-
-        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;
     }
 
     @Override

worldedit-core/src/main/java/com/sk89q/worldedit/Vector2D.java

@@ -627,8 +627,7 @@ public class Vector2D {
 
     @Override
     public int hashCode() {
-        return ((new Double(x)).hashCode() >> 13) ^
+        return ((int) x << 16) ^ (int) z;
-                (new Double(z)).hashCode();
     }
 
     @Override