From 75aca2e3949b0aa769e09010fca45cae8dfc6a35 Mon Sep 17 00:00:00 2001 From: mcmonkey4eva Date: Tue, 11 Nov 2014 18:52:01 -0800 Subject: [PATCH] Improve dLocation.equals, fixes #876 Theoretically corrects trouble with .getBlock() in weird locations. --- src/main/java/net/aufdemrand/denizen/objects/dLocation.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/aufdemrand/denizen/objects/dLocation.java b/src/main/java/net/aufdemrand/denizen/objects/dLocation.java index a3c85be14e..db70e24854 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/dLocation.java +++ b/src/main/java/net/aufdemrand/denizen/objects/dLocation.java @@ -274,7 +274,10 @@ public int hashCode() { public boolean equals(Object o) { if (o == null) return false; if (!(o instanceof dLocation)) return false; - return getBlock().getLocation().equals(((dLocation) o).getBlock().getLocation()); + dLocation other = (dLocation) o; + return Math.round(getX()) == Math.round(other.getX()) + && Math.round(getY()) == Math.round(other.getY()) + && Math.round(getZ()) == Math.round(other.getZ()); } String prefix = "Location";