tilera
/
Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull Requests Releases 1 Wiki Activity

Added super calls back in to re-enable attached capabilities.

This commit is contained in:
Sebastian Hartte 2016-10-01 01:24:20 +02:00
parent 882f240307
commit 754a1f1de3
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/appeng/tile/misc/TileInterface.java
View File

@ -370,13 +370,18 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, IT
@Override
public boolean hasCapability( Capability<?> capability, @Nullable EnumFacing facing )
{
return this.duality.hasCapability( capability, facing );
return this.duality.hasCapability( capability, facing )
|| super.hasCapability( capability, facing );
}
@Override
public <T> T getCapability( Capability<T> capability, @Nullable EnumFacing facing )
{
return this.duality.getCapability( capability, facing );
T result = this.duality.getCapability( capability, facing );
if( result != null )
{
return result;
}
return super.getCapability( capability, facing );
}
}

13
src/main/java/appeng/tile/networking/TileCableBus.java
View File

@ -400,7 +400,9 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
AEPartLocation partLocation = AEPartLocation.fromFacing( fromSide );
IPart part = getPart( partLocation );
return part != null && part.hasCapability( capabilityClass );
boolean result = part != null && part.hasCapability( capabilityClass );
return result || super.hasCapability( capabilityClass, fromSide );
}
@Override
@ -410,7 +412,14 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
AEPartLocation partLocation = AEPartLocation.fromFacing( fromSide );
IPart part = getPart( partLocation );
return part == null ? null : part.getCapability( capabilityClass );
T result = part == null ? null : part.getCapability( capabilityClass );
if( result != null )
{
return result;
}
return super.getCapability( capabilityClass, fromSide );
}
}