From da5f8c4ad4a8bc4b0b7842501fe7fc1a640c12ee Mon Sep 17 00:00:00 2001
From: AlgorithmX2 <AlgorithmX2@gmail.com>
Date: Tue, 28 Jan 2014 21:10:23 -0600
Subject: [PATCH] Fixed Incompatibility with FMP.

---
 block/networking/BlockCableBus.java | 8 ++++++++
 integration/modules/FMP.java        | 2 +-
 parts/CableBusContainer.java        | 4 ++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/block/networking/BlockCableBus.java b/block/networking/BlockCableBus.java
index f9094564..7c0bb092 100644
--- a/block/networking/BlockCableBus.java
+++ b/block/networking/BlockCableBus.java
@@ -4,6 +4,7 @@ import java.util.EnumSet;
 import java.util.List;
 import java.util.Random;
 
+import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.creativetab.CreativeTabs;
@@ -75,6 +76,13 @@ public class BlockCableBus extends AEBaseBlock
 	@Override
 	public int getLightValue(IBlockAccess world, int x, int y, int z)
 	{
+		Block block = blocksList[world.getBlockId( x, y, z )];
+		if ( block != null && block != this )
+		{
+			return block.getLightValue( world, x, y, z );
+		}
+		if ( block == null )
+			return 0;
 		return cb( world, x, y, z ).getLightValue();
 	}
 
diff --git a/integration/modules/FMP.java b/integration/modules/FMP.java
index 8a5f8091..8b94a604 100644
--- a/integration/modules/FMP.java
+++ b/integration/modules/FMP.java
@@ -84,7 +84,7 @@ public class FMP implements IIntegrationModule, IPartFactory, IPartConverter, IF
 		MultiPartRegistry.registerConverter( this );
 		MultiPartRegistry.registerParts( this, data );
 		MinecraftForge.EVENT_BUS.register( new FMPEvent() );
-		// MultipartGenerator.registerPassThroughInterface( "appeng.helpers.AEMultiTile" );
+		MultipartGenerator.registerPassThroughInterface( "appeng.helpers.AEMultiTile" );
 	}
 
 	@Override
diff --git a/parts/CableBusContainer.java b/parts/CableBusContainer.java
index 414c4907..c7abc3ea 100644
--- a/parts/CableBusContainer.java
+++ b/parts/CableBusContainer.java
@@ -274,6 +274,8 @@ public class CableBusContainer implements AEMultiTile, ICableBusContainer
 
 	public void addToWorld()
 	{
+		if ( inWorld )
+			return;
 		inWorld = true;
 
 		TileEntity te = getTile();
@@ -323,6 +325,8 @@ public class CableBusContainer implements AEMultiTile, ICableBusContainer
 
 	public void removeFromWorld()
 	{
+		if ( !inWorld )
+			return;
 		inWorld = false;
 
 		for (ForgeDirection s : ForgeDirection.values())