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

Vector and BlockVector should use the same hashCode

Browse Source 
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.
This commit is contained in:
Jesse Boyd 2017-01-10 16:03:10 +11:00
parent 9f24f84c2b
commit ad7fdd19fb
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
4 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,13 +84,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;

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

@ -80,12 +80,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