diff --git a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java index f22235beb09..9273a694100 100644 --- a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java +++ b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java @@ -279,6 +279,8 @@ public void register() public void deregister() { transmitters.clear(); + transmittersToAdd.clear(); + transmittersAdded.clear(); if(FMLCommonHandler.instance().getEffectiveSide().isServer()) { diff --git a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java index 01560310eb5..bf1092c6ccd 100644 --- a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java +++ b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java @@ -82,10 +82,8 @@ public void registerNetwork(DynamicNetwork network) public void removeNetwork(DynamicNetwork network) { - if(networks.contains(network)) - { - networks.remove(network); - } + networks.remove(network); + networksToChange.remove(network); } @SubscribeEvent