AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-13 17:28:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Huh, still had this lying around. Can't remember what it was trying to fix, but it doesn't seem to make things more broken so eh.

Browse Source
This commit is contained in:
Florian Nücke 2016-07-30 09:37:34 +02:00
parent 954613081a
commit b503b947e4
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/scala/li/cil/oc/server/network/Network.scala
View File

@ -267,16 +267,23 @@ private class Network private(private val data: mutable.Map[String, Network.Vert
val node = vertex.data
val neighbors = vertex.edges.map(_.other(vertex).data).toArray
var newAddress = ""
do {
newAddress = java.util.UUID.randomUUID().toString
} while (data.contains(newAddress) || otherNetwork.data.contains(newAddress))
// This may lead to splits, which is the whole reason we have to
// check the network of the other nodes after the readdressing.
node.remove()
do {
node.address = java.util.UUID.randomUUID().toString
} while (data.contains(node.address) || otherNetwork.data.contains(node.address))
node.address = newAddress
Network.joinNewNetwork(node)
neighbors.filter(_.network != null).foreach(_.connect(node))
if (node.address == newAddress) {
neighbors.filter(_.network != null).foreach(_.connect(node))
} else {
OpenComputers.log.error("I can't see this happening any other way than someone directly setting node addresses, which they shouldn't. So yeah. Shit'll be borked. Deal with it.")
node.remove() // well screw you then
}
})
duplicates.head.data.network.asInstanceOf[Network.Wrapper].network