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

This commit is contained in:
Florian Nücke 2014-07-17 17:52:41 +02:00
commit 35116c26cb

View File

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