tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Merge pull request #244 from thatsIch/pathgridcache

Browse source 
Fixed single loop
This commit is contained in:
Chris 2014-10-04 16:42:42 -07:00
commit 93c8460f9d
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/appeng/me/cache/PathGridCache.java vendored
View file

@ -59,7 +59,6 @@ public class PathGridCache implements IPathingGrid
final IGrid myGrid; final IGrid myGrid;
private HashSet<IPathItem> semiOpen = new HashSet<IPathItem>(); private HashSet<IPathItem> semiOpen = new HashSet<IPathItem>();
private HashSet<IPathItem> closedList = new HashSet<IPathItem>();
public int channelsByBlocks = 0; public int channelsByBlocks = 0;
public double channelPowerUsage = 0.0; public double channelPowerUsage = 0.0;
@ -123,8 +122,8 @@ public class PathGridCache implements IPathingGrid
{ {
int nodes = myGrid.getNodes().size(); int nodes = myGrid.getNodes().size();
ticksUntilReady = 20 + Math.max( 0, nodes / 100 - 20 ); ticksUntilReady = 20 + Math.max( 0, nodes / 100 - 20 );
closedList = new HashSet(); HashSet<IPathItem> closedList = new HashSet<IPathItem>();
semiOpen = new HashSet(); semiOpen = new HashSet<IPathItem>();
// myGrid.getPivot().beginVisit( new AdHocChannelUpdater( 0 ) // myGrid.getPivot().beginVisit( new AdHocChannelUpdater( 0 )
// ); // );
@ -136,7 +135,7 @@ public class PathGridCache implements IPathingGrid
GridConnection gc = (GridConnection) gcc; GridConnection gc = (GridConnection) gcc;
if ( !(gc.getOtherSide( node ).getMachine() instanceof TileController) ) if ( !(gc.getOtherSide( node ).getMachine() instanceof TileController) )
{ {
List open = new LinkedList(); List<IPathItem> open = new LinkedList<IPathItem>();
closedList.add( gc ); closedList.add( gc );
open.add( gc ); open.add( gc );
gc.setControllerRoute( (GridNode) node, true ); gc.setControllerRoute( (GridNode) node, true );
@ -166,10 +165,11 @@ public class PathGridCache implements IPathingGrid
{ {
if ( controllerState == ControllerState.CONTROLLER_ONLINE ) if ( controllerState == ControllerState.CONTROLLER_ONLINE )
{ {
for (TileController tc : controllers) final Iterator<TileController> controllerIterator = this.controllers.iterator();
if (controllerIterator.hasNext())
{ {
tc.getGridNode( ForgeDirection.UNKNOWN ).beginVisit( new ControllerChannelUpdater() ); final TileController controller = controllerIterator.next();
break; controller.getGridNode( ForgeDirection.UNKNOWN ).beginVisit( new ControllerChannelUpdater() );
} }
} }
@ -191,7 +191,7 @@ public class PathGridCache implements IPathingGrid
Achievements lastBracket = getAchievementBracket( lastChannels ); Achievements lastBracket = getAchievementBracket( lastChannels );
if ( currentBracket != lastBracket && currentBracket != null ) if ( currentBracket != lastBracket && currentBracket != null )
{ {
Set<Integer> players = new HashSet(); Set<Integer> players = new HashSet<Integer>();
for (IGridNode n : requireChannels) for (IGridNode n : requireChannels)
players.add( n.getPlayerID() ); players.add( n.getPlayerID() );
@ -349,13 +349,13 @@ public class PathGridCache implements IPathingGrid
@Override @Override
public ControllerState getControllerState() public ControllerState getControllerState()
{ {
return controllerState; return this.controllerState;
} }
@Override @Override
public boolean isNetworkBooting() public boolean isNetworkBooting()
{ {
return !active.isEmpty() && booting == false; return !this.active.isEmpty() && !this.booting;
} }
@Override @Override