From 0bc50733b5f361cfc42a4deb31d8906dc2a140e9 Mon Sep 17 00:00:00 2001 From: Bukkit/Spigot Date: Mon, 9 Jan 2012 23:55:43 -0500 Subject: [PATCH] Revert "Improved some debug in Location." This reverts commit 0569e71b26ffc88a5b752ce1217c3ba33e6586e9. By: EvilSeph --- paper-api/src/main/java/org/bukkit/Location.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/paper-api/src/main/java/org/bukkit/Location.java b/paper-api/src/main/java/org/bukkit/Location.java index f4b8c98972..4afabd8873 100644 --- a/paper-api/src/main/java/org/bukkit/Location.java +++ b/paper-api/src/main/java/org/bukkit/Location.java @@ -360,11 +360,7 @@ public class Location implements Cloneable { * @throws IllegalArgumentException for differing worlds */ public double distance(Location o) { - if (o == null || o.getWorld() != getWorld()) { - throw new IllegalArgumentException("Cannot measure distance between worlds or to null"); - } - - return Math.sqrt(Math.pow(x - o.x, 2) + Math.pow(y - o.y, 2) + Math.pow(z - o.z, 2)); + return Math.sqrt(distanceSquared(o)); } /** @@ -376,8 +372,10 @@ public class Location implements Cloneable { * @throws IllegalArgumentException for differing worlds */ public double distanceSquared(Location o) { - if (o == null || o.getWorld() != getWorld()) { - throw new IllegalArgumentException("Cannot measure distance between worlds or to null"); + if (o == null) { + throw new IllegalArgumentException("Cannot measure distance to a null world"); + } else if (o == null || o.getWorld() != getWorld()) { + throw new IllegalArgumentException("Cannot measure distance between " + getWorld().getName() + " and " + o.getWorld().getName()); } return Math.pow(x - o.x, 2) + Math.pow(y - o.y, 2) + Math.pow(z - o.z, 2);