Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into mc1.5

Browse source 
Conflicts:
	common/buildcraft/transport/EnergyPulser.java
This commit is contained in:
Christian 2013-03-28 07:46:50 -04:00
commit 04be016691
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
common/buildcraft/transport/EnergyPulser.java
View file

@ -18,21 +18,14 @@ public class EnergyPulser {
}
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;
}
}