Fixes #93, use energy was inverted, canUseEnergy was always returning true

This commit is contained in:
modmuss50 2015-08-05 18:21:56 +01:00
parent 56c747bb93
commit 4404122002

View file

@ -215,7 +215,7 @@ public abstract class TilePowerAcceptor extends RFProviderTile implements
@Override @Override
public double addEnergy(double energy) { public double addEnergy(double energy) {
return addEnergy(energy, true); return addEnergy(energy, false);
} }
@Override @Override
@ -229,21 +229,21 @@ public abstract class TilePowerAcceptor extends RFProviderTile implements
} }
@Override @Override
public boolean canUseEnergy(double energy) { public boolean canUseEnergy(double input) {
return this.energy >= energy; return input <= energy;
} }
@Override @Override
public double useEnergy(double energy) { public double useEnergy(double energy) {
return useEnergy(energy, true); return useEnergy(energy, false);
} }
@Override @Override
public double useEnergy(double energy, boolean simulate) { public double useEnergy(double extract, boolean simulate) {
double energyExtracted = Math.min(energy, Math.min(this.getMaxOutput(), energy)); double energyExtracted = Math.max(extract, Math.max(this.getMaxOutput(), extract));
if (!simulate) { if (!simulate) {
setEnergy(energy - energyExtracted); setEnergy(energy - energyExtracted);
} }
return energyExtracted; return energyExtracted;
} }