Skip to content

Commit 71e8db1

Browse files
committed
Fixed charger not taking full charge
GTNewHorizons/GT-New-Horizons-Modpack#7641
1 parent afcd7dd commit 71e8db1

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/main/java/appeng/tile/misc/TileCharger.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,11 @@ public void Tick_TileCharger()
121121
final ItemStack myItem = this.getStackInSlot( 0 );
122122

123123
// charge from the network!
124-
if( this.getInternalCurrentPower() < 1499 )
124+
if( this.getInternalCurrentPower() < getInternalMaxPower() )
125125
{
126126
try
127127
{
128-
this.injectExternalPower( PowerUnits.AE, this.getProxy().getEnergy().extractAEPower( Math.min( 150.0, 1500.0 - this.getInternalCurrentPower() ), Actionable.MODULATE, PowerMultiplier.ONE ) );
128+
this.injectExternalPower( PowerUnits.AE, this.getProxy().getEnergy().extractAEPower( Math.min( 150.0, getInternalMaxPower() - this.getInternalCurrentPower() ), Actionable.MODULATE, PowerMultiplier.ONE ) );
129129
this.tickTickTimer = 20; // keep ticking...
130130
}
131131
catch( final GridAccessException e )
@@ -157,11 +157,11 @@ public void Tick_TileCharger()
157157
this.tickTickTimer = 20; // keep ticking...
158158
}
159159
}
160-
else if( this.getInternalCurrentPower() > 1499 && materials.certusQuartzCrystal().isSameAs( myItem ) )
160+
else if( this.getInternalCurrentPower() == getInternalMaxPower() && materials.certusQuartzCrystal().isSameAs( myItem ) )
161161
{
162162
if( Platform.getRandomFloat() > 0.8f ) // simulate wait
163163
{
164-
this.extractAEPower( this.getInternalMaxPower(), Actionable.MODULATE, PowerMultiplier.CONFIG );// 1500
164+
this.extractAEPower( this.getInternalMaxPower()/PowerMultiplier.CONFIG.multiplier, Actionable.MODULATE, PowerMultiplier.CONFIG );// 1500
165165

166166
for( final ItemStack charged : materials.certusQuartzCrystalCharged().maybeStack( myItem.stackSize ).asSet() )
167167
{

0 commit comments

Comments
 (0)