diff --git a/gradle.properties b/gradle.properties index 4589f7e5b..8a8e4ffb6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ aechannel=stable aebuild=7 aegroup=appeng aebasename=appliedenergistics2 -trousers=omni-fixes-v46g +trousers=omni-fixes-v46h ######################################################### # Versions # diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java index 15c1e67bc..a06731ed4 100644 --- a/src/main/java/appeng/helpers/DualityInterface.java +++ b/src/main/java/appeng/helpers/DualityInterface.java @@ -178,7 +178,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn { return; } - if( inv == this.config ) + if( inv == this.config && ( !removed.isEmpty() || !added.isEmpty() ) ) { this.readConfig(); } diff --git a/src/main/java/appeng/parts/misc/PartStorageBus.java b/src/main/java/appeng/parts/misc/PartStorageBus.java index 5d093592d..1f5fe0a47 100644 --- a/src/main/java/appeng/parts/misc/PartStorageBus.java +++ b/src/main/java/appeng/parts/misc/PartStorageBus.java @@ -25,6 +25,9 @@ import java.util.Objects; import appeng.fluids.parts.FluidHandlerAdapter; import appeng.me.storage.MEPassThrough; +import appeng.parts.AEBasePart; +import appeng.tile.misc.TileInterface; +import appeng.tile.networking.TileCableBus; import appeng.util.ConfigManager; import com.jaquadro.minecraft.storagedrawers.api.capabilities.IItemRepository; import net.minecraft.entity.player.EntityPlayer; @@ -306,10 +309,19 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC { if( pos.offset( this.getSide().getFacing() ).equals( neighbor ) ) { + final TileEntity te = w.getTileEntity( neighbor ); // In case the TE was destroyed, we have to do a full reset immediately. - if( te == null ) + if( te instanceof TileCableBus ) + { + if( ( (TileCableBus) te ).getPart( this.getSide().getOpposite() ) instanceof PartInterface ) + { + this.resetCache( true ); + this.resetCache(); + } + } + if( te == null || te instanceof TileInterface ) { this.resetCache( true ); this.resetCache();