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

Fluid import/export bus fixes.

Browse Source 
* use correct side for capability.
* don't to to sleep if there is nothing to extract.
This commit is contained in:
Florian Scandella
2018-06-22 21:34:33 +02:00
parent 51481d3e30
commit d635a87f01
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/fluids/parts/PartFluidExportBus.java
+2 -2
View File
@@ -109,11 +109,11 @@ public class PartFluidExportBus extends PartSharedFluidBus
final TileEntity te = this.getConnectedTE(); final TileEntity te = this.getConnectedTE();
if( te != null && te.hasCapability( CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, this.getSide().getFacing() ) ) if( te != null && te.hasCapability( CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, this.getSide().getFacing().getOpposite() ) )
{ {
try try
{ {
final IFluidHandler fh = te.getCapability( CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, this.getSide().getFacing() ); final IFluidHandler fh = te.getCapability( CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, this.getSide().getFacing().getOpposite() );
final IMEMonitor<IAEFluidStack> inv = this.getProxy().getStorage().getInventory( this.getChannel() ); final IMEMonitor<IAEFluidStack> inv = this.getProxy().getStorage().getInventory( this.getChannel() );
if( fh != null ) if( fh != null )
src/main/java/appeng/fluids/parts/PartFluidImportBus.java
+4 -2
View File
@@ -103,11 +103,11 @@ public class PartFluidImportBus extends PartSharedFluidBus
final TileEntity te = this.getConnectedTE(); final TileEntity te = this.getConnectedTE();
if( te != null && te.hasCapability( CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, this.getSide().getFacing() ) ) if( te != null && te.hasCapability( CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, this.getSide().getFacing().getOpposite() ) )
{ {
try try
{ {
final IFluidHandler fh = te.getCapability( CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, this.getSide().getFacing() ); final IFluidHandler fh = te.getCapability( CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, this.getSide().getFacing().getOpposite() );
final IMEMonitor<IAEFluidStack> inv = this.getProxy().getStorage().getInventory( this.getChannel() ); final IMEMonitor<IAEFluidStack> inv = this.getProxy().getStorage().getInventory( this.getChannel() );
if( fh != null ) if( fh != null )
@@ -134,6 +134,8 @@ public class PartFluidImportBus extends PartSharedFluidBus
return TickRateModulation.FASTER; return TickRateModulation.FASTER;
} }
return TickRateModulation.IDLE;
} }
} }
catch( GridAccessException e ) catch( GridAccessException e )