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

Workaround rare race condition related to setLevel racing with other minecraft code

Browse Source
This commit is contained in:
DBotThePony 2025-02-08 00:16:30 +07:00
parent b9d85b7b17
commit a0f605c396
Signed by: DBot
GPG Key ID: DCC23B5715498507
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryBlockEntity.kt
View File

@ -54,6 +54,7 @@ import ru.dbotthepony.mc.otm.core.util.TickList
import ru.dbotthepony.mc.otm.core.util.countingLazy import ru.dbotthepony.mc.otm.core.util.countingLazy
import ru.dbotthepony.mc.otm.network.BlockEntitySyncPacket import ru.dbotthepony.mc.otm.network.BlockEntitySyncPacket
import ru.dbotthepony.mc.otm.network.syncher.SynchableGroup import ru.dbotthepony.mc.otm.network.syncher.SynchableGroup
import ru.dbotthepony.mc.otm.once
import ru.dbotthepony.mc.otm.onceServer import ru.dbotthepony.mc.otm.onceServer
import ru.dbotthepony.mc.otm.registry.game.MBlocks import ru.dbotthepony.mc.otm.registry.game.MBlocks
import ru.dbotthepony.mc.otm.sometimeServer import ru.dbotthepony.mc.otm.sometimeServer
@ -240,7 +241,10 @@ abstract class MatteryBlockEntity(p_155228_: BlockEntityType<*>, p_155229_: Bloc
protected fun waitForServerLevel(lambda: () -> Unit) { protected fun waitForServerLevel(lambda: () -> Unit) {
if (level is ServerLevel) { if (level is ServerLevel) {
if (executeWaitForServerLevel)
lambda.invoke() lambda.invoke()
else
waitForServerLevel.add(lambda)
} else if (level == null) { } else if (level == null) {
waitForServerLevel.add(lambda) waitForServerLevel.add(lambda)
} }
@ -371,6 +375,7 @@ abstract class MatteryBlockEntity(p_155228_: BlockEntityType<*>, p_155229_: Bloc
val syncher = SynchableGroup() val syncher = SynchableGroup()
private val synchers = Object2ObjectArrayMap<ServerPlayer, SynchableGroup.Remote>() private val synchers = Object2ObjectArrayMap<ServerPlayer, SynchableGroup.Remote>()
private var executeWaitForServerLevel = false
override fun setLevel(level: Level) { override fun setLevel(level: Level) {
val old = this.level val old = this.level
@ -380,9 +385,15 @@ abstract class MatteryBlockEntity(p_155228_: BlockEntityType<*>, p_155229_: Bloc
if (!level.isClientSide) { if (!level.isClientSide) {
subscribe() subscribe()
level.once {
if (isRemoved) return@once
executeWaitForServerLevel = true
waitForServerLevel.forEach { it.invoke() } waitForServerLevel.forEach { it.invoke() }
waitForServerLevel.clear() waitForServerLevel.clear()
}
} else { } else {
executeWaitForServerLevel = true
waitForServerLevel.clear() waitForServerLevel.clear()
BlockEntitySyncPacket.applyBacklog(this) BlockEntitySyncPacket.applyBacklog(this)
} }