Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-09-04 19:21:11 +02:00
Code Issues Projects Releases Wiki Activity

Fix manhattan methods using doubles, add signature for LocationS.

Browse Source
This commit is contained in:
asofold 2014-10-29 00:52:05 +01:00
parent 9827570e2d
commit e12c2a2bfc
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/TrigUtil.java
View File

@ -391,6 +391,16 @@ public class TrigUtil {
else if (yawDiff > 180f) yawDiff -= 360f;
return yawDiff;
}
/**
* Manhattan distance.
* @param loc1
* @param loc2
* @return
*/
public static int manhattan(final Location loc1, final Location loc2) {
return manhattan(loc1.getBlockX(), loc1.getBlockY(), loc1.getBlockZ(), loc2.getBlockX(), loc2.getBlockY(), loc2.getBlockZ());
}
/**
* Manhattan distance.
@ -405,7 +415,7 @@ public class TrigUtil {
}
public static double manhattan(final double x1,final double z1, final double x2, final double z2){
return Math.abs(x1 - x2) + Math.abs(z1 - z2);
return manhattan(Location.locToBlock(x1), Location.locToBlock(z1), Location.locToBlock(x2), Location.locToBlock(z2));
}
/**
@ -423,7 +433,7 @@ public class TrigUtil {
}
public static double manhattan(final double x1, final double y1, final double z1, final double x2, final double y2, final double z2){
return Math.abs(x1 - x2) + Math.abs(y1 - y2) + Math.abs(z1 - z2);
return manhattan(Location.locToBlock(x1), Location.locToBlock(y1), Location.locToBlock(z1), Location.locToBlock(x2), Location.locToBlock(y2), Location.locToBlock(z2));
}
/**