DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Try to prevent recursive energy transfer on cables

Browse Source
This commit is contained in:
DBotThePony 2025-03-29 20:22:44 +07:00
parent 3e5f47c9a3
commit 69e4747363
Signed by: DBot
GPG Key ID: DCC23B5715498507
2 changed files with 91 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/cable/EnergyCableBlockEntity.kt
View File

@ -1,5 +1,6 @@
package ru.dbotthepony.mc.otm.block.entity.cable package ru.dbotthepony.mc.otm.block.entity.cable
import it.unimi.dsi.fastutil.objects.ObjectArraySet
import net.minecraft.core.BlockPos import net.minecraft.core.BlockPos
import net.minecraft.core.Direction import net.minecraft.core.Direction
import net.minecraft.world.level.Level import net.minecraft.world.level.Level
@ -114,6 +115,8 @@ abstract class EnergyCableBlockEntity(type: BlockEntityType<*>, blockPos: BlockP
val sides get() = energySides val sides get() = energySides
val currentlyTransferringTo = ObjectArraySet<Pair<Node, RelativeSide>>()
override fun onNeighbour(link: Link) { override fun onNeighbour(link: Link) {
if (link is DirectionLink) { if (link is DirectionLink) {
updateBlockState(link.direction, true) updateBlockState(link.direction, true)

9
src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/cable/EnergyCableGraph.kt
View File

@ -19,6 +19,7 @@ import ru.dbotthepony.mc.otm.core.shuffle
import ru.dbotthepony.mc.otm.graph.GraphNodeList import ru.dbotthepony.mc.otm.graph.GraphNodeList
import ru.dbotthepony.mc.otm.onceServer import ru.dbotthepony.mc.otm.onceServer
import java.util.* import java.util.*
import java.util.concurrent.atomic.AtomicLong
import kotlin.collections.ArrayList import kotlin.collections.ArrayList
import kotlin.collections.HashSet import kotlin.collections.HashSet
import kotlin.collections.LinkedHashSet import kotlin.collections.LinkedHashSet
@ -635,6 +636,11 @@ class EnergyCableGraph : GraphNodeList<EnergyCableBlockEntity.Node, EnergyCableG
val snapshot = Reference2ObjectOpenHashMap<Segment, Decimal>() val snapshot = Reference2ObjectOpenHashMap<Segment, Decimal>()
for (pair in itr) { for (pair in itr) {
// recursion prevention
if (!fromNode.currentlyTransferringTo.add(pair))
continue
try {
val (node, relSide) = pair val (node, relSide) = pair
val side = node.sides[relSide]!! val side = node.sides[relSide]!!
@ -726,6 +732,9 @@ class EnergyCableGraph : GraphNodeList<EnergyCableBlockEntity.Node, EnergyCableG
paths.forEach { it.shortCircuit = true } paths.forEach { it.shortCircuit = true }
} }
} }
} finally {
fromNode.currentlyTransferringTo.remove(pair)
}
} }
return received return received