Merge branch 'development' into 1.8

This commit is contained in:
Aidan C. Brady committed 2014-08-19 19:08:47 -04:00
commit 6b4ef3bb50
2 files changed
+9 -7

No files matched your search

@@ -141,17 +141,15 @@ public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork>
double sent = 0;
boolean tryAgain = false;
int i = 0;
do {
tryAgain = false;
double prev = sent;
sent += doEmit(energyToSend-sent, tryAgain);
if(energyToSend-sent > 0 && sent-prev > 0)
{
tryAgain = true;
}
tryAgain = energyToSend-sent > 0 && sent-prev > 0 && i < 100;
i++;
} while(tryAgain);
joulesTransmitted = sent;