Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into robot_components

li/cil/oc/common/tileentity/Environment.scala

@@ -22,7 +22,7 @@ abstract class Environment extends net.minecraft.tileentity.TileEntity with Tile
 
   def block = getBlockType
 
-  private var addedToNetwork = false
+  protected var addedToNetwork = false
 
   // ----------------------------------------------------------------------- //
 

li/cil/oc/common/tileentity/Robot.scala

@@ -237,7 +237,8 @@ class Robot(isRemote: Boolean) extends Computer(isRemote) with ISidedInventory w
   // ----------------------------------------------------------------------- //
 
   override def updateEntity() {
-    if (node != null && node.network == null) {
+    if (!addedToNetwork) {
+      addedToNetwork = true
       api.Network.joinNewNetwork(node)
     }
     if (animationTicksLeft > 0) {
@@ -270,6 +271,7 @@ class Robot(isRemote: Boolean) extends Computer(isRemote) with ISidedInventory w
         case Some(item) => player_.getAttributeMap.applyAttributeModifiers(item.getAttributeModifiers)
         case _ =>
       }
+      updateXpInfo()
     }
   }
 

li/cil/oc/server/network/Network.scala

@@ -100,7 +100,7 @@ private class Network private(private val data: mutable.Map[String, Network.Vert
     data.remove(node.address) match {
       case Some(entry) =>
         node match {
-          case connector: Connector if connector.localBufferSize > 0 => removeConnector(connector)
+          case connector: Connector => removeConnector(connector)
           case _ =>
         }
         node.network = null
@@ -287,10 +287,12 @@ private class Network private(private val data: mutable.Map[String, Network.Vert
   }
 
   def removeConnector(connector: Connector) {
-    assert(connectors.contains(connector))
-    connectors -= connector
-    globalBuffer -= connector.localBuffer
-    globalBufferSize -= connector.localBufferSize
+    if (connector.localBufferSize > 0) {
+      assert(connectors.contains(connector))
+      connectors -= connector
+      globalBuffer -= connector.localBuffer
+      globalBufferSize -= connector.localBufferSize
+    }
   }
 
   def changeBuffer(delta: Double): Double = {