minecraft
/
PhysicalConnectivity
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Fix ConcurrentModificationExceptions

This commit is contained in:
Shadowfacts 2021-02-17 22:31:48 -05:00
parent 6a06ef6ae0
commit 7034ce11ef
Signed by: shadowfacts
GPG Key ID: 94A5AB95422746E5
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/kotlin/net/shadowfacts/phycon/network/block/terminal/TerminalBlockEntity.kt
View File

@ -161,12 +161,11 @@ class TerminalBlockEntity: DeviceBlockEntity(PhyBlockEntities.TERMINAL),
private fun finishPendingRequests() { private fun finishPendingRequests() {
if (world!!.isClient) return if (world!!.isClient) return
if (pendingRequests.isEmpty()) return
for (request in pendingRequests) { val finishable = pendingRequests.filter { it.isFinishable(counter) }
if (request.isFinishable(counter)) { // stackLocateRequestCompleted removes the object from pendingRequests
stackLocateRequestCompleted(request) finishable.forEach(::stackLocateRequestCompleted)
}
}
} }
fun addObserver() { fun addObserver() {

9
src/main/kotlin/net/shadowfacts/phycon/network/component/NetworkStackDispatcher.kt
View File

@ -72,9 +72,10 @@ interface NetworkStackDispatcher<Insertion: NetworkStackDispatcher.PendingInsert
fun <Self, Insertion: NetworkStackDispatcher.PendingInsertion<Insertion>> Self.finishTimedOutPendingInsertions() where Self: BlockEntity, Self: NetworkStackDispatcher<Insertion> { fun <Self, Insertion: NetworkStackDispatcher.PendingInsertion<Insertion>> Self.finishTimedOutPendingInsertions() where Self: BlockEntity, Self: NetworkStackDispatcher<Insertion> {
if (world!!.isClient) return if (world!!.isClient) return
if (pendingInsertions.isEmpty()) return
for (insertion in pendingInsertions) { val finishable = pendingInsertions.filter { it.isFinishable(this) }
if (!insertion.isFinishable(this)) continue // finishInsertion removes the object from pendingInsertions
finishInsertion(insertion) finishable.forEach(::finishInsertion)
} // todo: if a timed-out insertion can't be finished, we should probably retry after some time (exponential backoff?)
} }