projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-06 21:13:37 -04:00
Code Issues Projects Releases Wiki Activity

Fixed CPU issue where binary search has infinite loop

Browse Source
This commit is contained in:
Obique PSWG
2015-11-01 08:48:53 -06:00
parent 1776e26bd0
commit 4e704120a0
1 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/objects/ClientBuildoutService.java
+11 -23
View File
@@ -199,32 +199,20 @@ public class ClientBuildoutService extends Service {
private BuildoutArea getAreaForObject(SWGObject obj) {
Location l = obj.getWorldLocation();
return binarySearch(l.getTerrain(), l.getX(), l.getZ());
return binarySearch(l.getTerrain(), l.getX(), l.getZ(), 0, areas.size());
}
private BuildoutArea binarySearch(Terrain t, double x, double z) {
int low = 0;
int high = areas.size();
int comp = 0;
while ((comp = binarySearch(low, high, t, x, z)) != 0 && low != high) {
int mid = mid(low, high);
if (comp == 0)
return areas.get(mid);
if (comp < 0) {
low = mid;
} else {
high = mid;
}
}
BuildoutArea area = areas.get(mid(low, high));
if (compare(area, t, x, z) == 0)
return area;
else
private BuildoutArea binarySearch(Terrain t, double x, double z, int low, int high) {
int mid = mid(low, high);
BuildoutArea midArea = areas.get(mid);
int comp = compare(midArea, t, x, z);
if (comp == 0)
return midArea;
if (low == mid)
return null;
}
private int binarySearch(int low, int high, Terrain t, double x, double z) {
return compare(areas.get(mid(low, high)), t, x, z);
if (comp < 0)
return binarySearch(t, x, z, low, mid);
return binarySearch(t, x, z, mid, high);
}
private int compare(BuildoutArea cur, Terrain t, double x, double z) {