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

protect from missing nodes in hub plugs

Browse Source 
closes #2445
This commit is contained in:
payonel 2018-03-11 22:40:55 -07:00
parent 54bf2c21e5
commit f6f067ef29
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/scala/li/cil/oc/common/tileentity/traits/Hub.scala
View File

@ -17,7 +17,11 @@ import scala.collection.mutable
trait Hub extends traits.Environment with SidedEnvironment { trait Hub extends traits.Environment with SidedEnvironment {
override def node: Node = null override def node: Node = null
override protected def isConnected = plugs.exists(plug => plug.node.address != null && plug.node.network != null) override protected def isConnected = plugs.exists(plug =>
plug != null &&
plug.node != null &&
plug.node.address != null &&
plug.node.network != null)
protected val plugs = ForgeDirection.VALID_DIRECTIONS.map(side => createPlug(side)) protected val plugs = ForgeDirection.VALID_DIRECTIONS.map(side => createPlug(side))
@ -120,7 +124,8 @@ trait Hub extends traits.Environment with SidedEnvironment {
if (isServer) { if (isServer) {
nbt.setNewTagList(Settings.namespace + "plugs", plugs.map(plug => { nbt.setNewTagList(Settings.namespace + "plugs", plugs.map(plug => {
val plugNbt = new NBTTagCompound() val plugNbt = new NBTTagCompound()
plug.node.save(plugNbt) if (plug.node != null)
plug.node.save(plugNbt)
plugNbt plugNbt
})) }))
nbt.setNewTagList(Settings.namespace + "queue", queue.map { nbt.setNewTagList(Settings.namespace + "queue", queue.map {