Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

2014-06-06 21:10:26 -05:00
parent 3b394face2 9ae4ce54d1
commit 03330d02ba
7 changed files with 83 additions and 44 deletions
@@ -29,6 +29,7 @@ public class QuantumCluster implements ILocatable, IAECluster
 	public WorldCoord min;
 	public WorldCoord max;
 	public boolean isDestroyed = false;
+	private boolean updateStatus = true;

 	boolean registered = false;
 	private long thisSide;
@@ -85,6 +86,7 @@ public class QuantumCluster implements ILocatable, IAECluster
 	{
 		if ( center.getWorldObj() == e.world )
 		{
+			updateStatus = false;
 			destroy();
 		}
 	}
@@ -209,11 +211,14 @@ public class QuantumCluster implements ILocatable, IAECluster
 			MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.Unregister ) );
 		}

-		center.updateStatus( null, (byte) -1 );
-
-		for (TileQuantumBridge r : Ring)
+		if ( updateStatus )
 		{
-			r.updateStatus( null, (byte) -1 );
+			center.updateStatus( null, (byte) -1 );
+
+			for (TileQuantumBridge r : Ring)
+			{
+				r.updateStatus( null, (byte) -1 );
+			}
 		}

 		center = null;