fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes #2768: Incorrect return value when charging items via Tesla. (#2771)

Browse Source
This commit is contained in:
yueh
2017-01-31 12:17:32 +01:00
committed by Gunther De Wachter
parent 178198b0c6
commit cd78586910
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/items/tools/powered/powersink/PoweredItemCapabilities.java
+2 -2
View File
@@ -85,10 +85,10 @@ class PoweredItemCapabilities implements ICapabilityProvider, IEnergyStorage
@Override @Override
public int receiveEnergy( int maxReceive, boolean simulate ) public int receiveEnergy( int maxReceive, boolean simulate )
{ {
if( simulate ) if( simulate )
{ {
final int required = (int) PowerUnits.AE.convertTo( PowerUnits.RF, item.getAEMaxPower( is ) - item.getAECurrentPower( is ) ); final int required = (int) PowerUnits.AE.convertTo( PowerUnits.RF, item.getAEMaxPower( is ) - item.getAECurrentPower( is ) );
if( maxReceive < required ) if( maxReceive < required )
{ {
return 0; return 0;
@@ -98,7 +98,7 @@ class PoweredItemCapabilities implements ICapabilityProvider, IEnergyStorage
else else
{ {
final double powerRemainder = item.injectAEPower( is, PowerUnits.RF.convertTo( PowerUnits.AE, maxReceive ) ); final double powerRemainder = item.injectAEPower( is, PowerUnits.RF.convertTo( PowerUnits.AE, maxReceive ) );
return (int) PowerUnits.AE.convertTo( PowerUnits.RF, powerRemainder ); return maxReceive - (int) PowerUnits.AE.convertTo( PowerUnits.RF, powerRemainder );
} }
} }