Merge pull request #19 from xFier/master

Fix problem with measuring distance between different worlds
DevotedMC · Jun 7, 2020 · 50155b6 · 50155b6
2 parents c7c027e + c64e828
commit 50155b6
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/main/java/com/untamedears/jukealert/util/JAUtility.java b/src/main/java/com/untamedears/jukealert/util/JAUtility.java
@@ -26,6 +26,8 @@ public final class JAUtility {
 	private JAUtility() {
 
 	}
+
+	private static double tanPiDiv = Math.sqrt(2.0) - 1.0;
 
 	public static Snitch findClosestSnitch(Location loc, PermissionType perm, UUID player) {
 		Snitch closestSnitch = null;
@@ -73,11 +75,14 @@ public static TextComponent genTextComponent(Snitch snitch) {
 	}
 
 	public static String genDirections(Snitch snitch, Player player) {
-		return String.format("%s[%sm %s%s%s]", ChatColor.GREEN, Math.round(player.getLocation().distance(snitch.getLocation())), ChatColor.RED, getCardinal(player.getLocation(), snitch.getLocation()), ChatColor.GREEN);
+		if (snitch.getLocation().getWorld().equals(player.getLocation().getWorld())) {
+			return String.format("%s[%sm %s%s%s]", ChatColor.GREEN, Math.round(player.getLocation().distance(snitch.getLocation())), ChatColor.RED, getCardinal(player.getLocation(), snitch.getLocation()), ChatColor.GREEN);
+		} else {
+			return ""; // Can't get directions to another world
+		}
 	}
 
 	public static String getCardinal(Location start, Location end) {
-		double tanPiDiv = Math.sqrt(2.0) - 1.0;
 		double dX = start.getBlockX() - end.getBlockX();
 		double dZ = start.getBlockZ() - end.getBlockZ();