Azimkin/Bukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Improved some debug in Location."

Browse Source 
This reverts commit 0569e71b26ffc88a5b752ce1217c3ba33e6586e9.
This commit is contained in:
EvilSeph 2012-01-09 23:55:43 -05:00
parent 774a3b1342
commit af8b5d0b9b
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/bukkit/Location.java
View File

@ -360,11 +360,7 @@ public class Location implements Cloneable {
* @throws IllegalArgumentException for differing worlds * @throws IllegalArgumentException for differing worlds
*/ */
public double distance(Location o) { public double distance(Location o) {
if (o == null || o.getWorld() != getWorld()) { return Math.sqrt(distanceSquared(o));
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));
} }
/** /**
@ -376,8 +372,10 @@ public class Location implements Cloneable {
* @throws IllegalArgumentException for differing worlds * @throws IllegalArgumentException for differing worlds
*/ */
public double distanceSquared(Location o) { public double distanceSquared(Location o) {
if (o == null || o.getWorld() != getWorld()) { if (o == null) {
throw new IllegalArgumentException("Cannot measure distance between worlds or to 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); return Math.pow(x - o.x, 2) + Math.pow(y - o.y, 2) + Math.pow(z - o.z, 2);