Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2

This commit is contained in:
Florian Nücke 2014-07-17 17:51:56 +02:00
commit db2b443f51

View File

@ -19,7 +19,7 @@ trait Environment extends TileEntity with network.Environment with driver.Contai
override def markChanged() = markDirty()
protected def isConnected = node.address != null && node.network != null
protected def isConnected = node != null && node.address != null && node.network != null
// ----------------------------------------------------------------------- //