Merge branch 'master' into mc1.5

Conflicts: common/buildcraft/transport/EnergyPulser.java
BuildCraft · Mar 28, 2013 · 04be016 · 04be016
2 parents 4a8f165 + eb8d6ca
commit 04be016
Showing 1 changed file with 5 additions and 12 deletions.
diff --git a/common/buildcraft/transport/EnergyPulser.java b/common/buildcraft/transport/EnergyPulser.java
@@ -18,21 +18,14 @@ public EnergyPulser(IPowerReceptor receptor) {
 	}
 
 	public void update() {
-		if (powerReceptor == null)
+		if (powerReceptor == null || !isActive || tick++ % 10 != 0)
 			return;
 
-		if (isActive)
+		if (!singlePulse || !hasPulsed)
 		{
-			tick++;
-			if (!singlePulse || !hasPulsed) {
-				if (tick % 10 == 0 || !hasPulsed)
-				{
-					powerReceptor.getPowerProvider().receiveEnergy(Math.min(1 << (pulseCount-1),64), ForgeDirection.WEST);
-					if (singlePulse) {
-						hasPulsed = true;
-					}
-				}
-			}
+			System.out.printf("Pulsing%d\n",Math.min(1 << (pulseCount-1),64));
+			powerReceptor.getPowerProvider().receiveEnergy(Math.min(1 << (pulseCount-1),64), ForgeDirection.WEST);
+			hasPulsed = true;
 		}
 	}