AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-18 11:48:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Should fix a reported NPE in server racks.

Browse Source
This commit is contained in:
Florian Nücke 2014-07-05 22:06:14 +02:00
parent fc16ceb935
commit 0e5f320a47
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/li/cil/oc/common/tileentity/PowerDistributor.scala
View File

@ -14,6 +14,8 @@ class PowerDistributor extends traits.Environment with traits.PowerBalancer with
withConnector(Settings.get.bufferDistributor). withConnector(Settings.get.bufferDistributor).
create()) create())
override protected def isConnected = nodes.exists(node => node.address != null && node.network != null)
override def canUpdate = isServer override def canUpdate = isServer
// ----------------------------------------------------------------------- // // ----------------------------------------------------------------------- //

4
src/main/scala/li/cil/oc/common/tileentity/traits/PowerBalancer.scala
View File

@ -7,9 +7,11 @@ import net.minecraftforge.common.ForgeDirection
trait PowerBalancer extends PowerInformation with SidedEnvironment { trait PowerBalancer extends PowerInformation with SidedEnvironment {
var globalBuffer, globalBufferSize = 0.0 var globalBuffer, globalBufferSize = 0.0
protected def isConnected: Boolean
override def updateEntity() { override def updateEntity() {
super.updateEntity() super.updateEntity()
if (isServer && world.getWorldTime % Settings.get.tickFrequency == 0) { if (isServer && isConnected && world.getWorldTime % Settings.get.tickFrequency == 0) {
val nodes = connectors val nodes = connectors
def network(connector: Connector) = if (connector != null && connector.network != null) connector.network else this def network(connector: Connector) = if (connector != null && connector.network != null) connector.network else this
// Yeeeeah, so that just happened... it's not a beauty, but it works. This // Yeeeeah, so that just happened... it's not a beauty, but it works. This