From b6955d42b6bb8e4bbed2b281dc362b10d84b897d Mon Sep 17 00:00:00 2001 From: PrototypeTrousers Date: Fri, 19 Aug 2022 11:31:56 -0300 Subject: [PATCH] Fixes "Device missing channel" when channels are disabled and a ME controller is present on the network --- src/main/java/appeng/me/GridNode.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/appeng/me/GridNode.java b/src/main/java/appeng/me/GridNode.java index a2056d5f6..168d9b4a0 100644 --- a/src/main/java/appeng/me/GridNode.java +++ b/src/main/java/appeng/me/GridNode.java @@ -27,6 +27,8 @@ import java.util.Deque; import java.util.EnumSet; import java.util.List; +import appeng.core.AEConfig; +import appeng.core.features.AEFeature; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; @@ -375,7 +377,14 @@ public class GridNode implements IGridNode, IPathItem @Override public boolean meetsChannelRequirements() { - return ( !this.gridProxy.getFlags().contains( GridFlags.REQUIRE_CHANNEL ) || this.getUsedChannels() > 0 ); + if( this.gridProxy.getFlags().contains( GridFlags.REQUIRE_CHANNEL ) ) + { + if( AEConfig.instance().isFeatureEnabled( AEFeature.CHANNELS ) ) + { + return this.getUsedChannels() > 0; + } + } + return true; } @Override