Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-07-02 23:20:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #379 from boy0001/vector-fix

Browse Source 
Vector and BlockVector should use the same hashCode
This commit is contained in:
Matthew Miller 2018-02-17 16:18:35 +10:00 committed by GitHub
commit b17f2b55d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
worldedit-core/src/main/java/com/sk89q/worldedit/BlockVector.java
View File

@ -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;

11
worldedit-core/src/main/java/com/sk89q/worldedit/BlockVector2D.java
View File

@ -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;

7
worldedit-core/src/main/java/com/sk89q/worldedit/Vector.java
View File

@ -789,12 +789,7 @@ public class Vector implements Comparable<Vector> {
@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

3
worldedit-core/src/main/java/com/sk89q/worldedit/Vector2D.java
View File

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