From 03cc33f501e49abb6d57fe355e1bf8e7b098643b Mon Sep 17 00:00:00 2001 From: Richard Freimer Date: Mon, 22 Apr 2019 14:20:40 -0400 Subject: [PATCH] As we disable capabilities when a side config has them disabled we need to notify the neighbor of an update when a side's config changes. (#5426) --- .../network/PacketConfigurationUpdate.java | 38 +++++++++---------- .../mekanism/common/util/MekanismUtils.java | 14 +++++++ 2 files changed, 31 insertions(+), 21 deletions(-) diff --git a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java index 023929bcc..c4b9fae00 100644 --- a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java +++ b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java @@ -3,15 +3,16 @@ package mekanism.common.network; import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.api.Range4D; +import mekanism.api.TileNetworkList; import mekanism.api.transmitters.TransmissionType; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ITileNetwork; -import mekanism.api.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketConfigurationUpdate.ConfigurationUpdateMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.tile.component.TileComponentEjector; import mekanism.common.tile.prefab.TileEntityBasicBlock; import mekanism.common.util.CapabilityUtils; import mekanism.common.util.MekanismUtils; @@ -30,12 +31,10 @@ public class PacketConfigurationUpdate implements IMessageHandler - { + PacketHandler.handlePacket(() -> { TileEntity tile = message.coord4D.getTileEntity(player.world); - ITileNetwork network = CapabilityUtils.getCapability(tile, Capabilities.TILE_NETWORK_CAPABILITY, null); - if (tile instanceof ISideConfiguration) { + ITileNetwork network = CapabilityUtils.getCapability(tile, Capabilities.TILE_NETWORK_CAPABILITY, null); ISideConfiguration config = (ISideConfiguration) tile; if (message.packetType == ConfigurationPacket.EJECT) { @@ -43,41 +42,38 @@ public class PacketConfigurationUpdate implements IMessageHandler