twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-07 07:32:03 -07:00
Code Issues Packages Projects Releases Wiki Activity

SPIGOT-4815: Location.equals() not working

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Bukkit/Spigot
2019-04-30 09:36:30 +10:00
parent dc652253ed
commit 4c0157d6de
3 changed files with 79 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
paper-api/src/main/java/org/bukkit/Location.java
View File

@@ -543,7 +543,9 @@ public class Location implements Cloneable, ConfigurationSerializable {
}
final Location other = (Location) obj;
if (this.world != other.world && (this.world == null || !this.world.equals(other.world))) {
World world = (this.world == null) ? null : this.world.get();
World otherWorld = (other.world == null) ? null : other.world.get();
if (world != otherWorld && (world == null || !world.equals(otherWorld))) {
return false;
}
if (Double.doubleToLongBits(this.x) != Double.doubleToLongBits(other.x)) {
@@ -568,7 +570,7 @@ public class Location implements Cloneable, ConfigurationSerializable {
public int hashCode() {
int hash = 3;
World world = (this.world == null) ? null : getWorld();
World world = (this.world == null) ? null : this.world.get();
hash = 19 * hash + (world != null ? world.hashCode() : 0);
hash = 19 * hash + (int) (Double.doubleToLongBits(this.x) ^ (Double.doubleToLongBits(this.x) >>> 32));
hash = 19 * hash + (int) (Double.doubleToLongBits(this.y) ^ (Double.doubleToLongBits(this.y) >>> 32));
@@ -580,7 +582,7 @@ public class Location implements Cloneable, ConfigurationSerializable {
@Override
public String toString() {
World world = (this.world == null) ? null : getWorld();
World world = (this.world == null) ? null : this.world.get();
return "Location{" + "world=" + world + ",x=" + x + ",y=" + y + ",z=" + z + ",pitch=" + pitch + ",yaw=" + yaw + '}';
}