mirror of
https://github.com/MightyPirates/OpenComputers.git
synced 2025-09-13 17:28:52 -04:00
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.
This commit is contained in:
parent
954613081a
commit
b503b947e4
@ -267,16 +267,23 @@ private class Network private(private val data: mutable.Map[String, Network.Vert
|
|||||||
val node = vertex.data
|
val node = vertex.data
|
||||||
val neighbors = vertex.edges.map(_.other(vertex).data).toArray
|
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
|
// This may lead to splits, which is the whole reason we have to
|
||||||
// check the network of the other nodes after the readdressing.
|
// check the network of the other nodes after the readdressing.
|
||||||
node.remove()
|
node.remove()
|
||||||
|
node.address = newAddress
|
||||||
do {
|
|
||||||
node.address = java.util.UUID.randomUUID().toString
|
|
||||||
} while (data.contains(node.address) || otherNetwork.data.contains(node.address))
|
|
||||||
|
|
||||||
Network.joinNewNetwork(node)
|
Network.joinNewNetwork(node)
|
||||||
|
|
||||||
|
if (node.address == newAddress) {
|
||||||
neighbors.filter(_.network != null).foreach(_.connect(node))
|
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
|
duplicates.head.data.network.asInstanceOf[Network.Wrapper].network
|
||||||
|
Loading…
x
Reference in New Issue
Block a user