Skip to content

add worldthreader support #358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
runningbird2 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add worldthreader support #358

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions src/main/kotlin/com/github/quiltservertools/ledger/database/DatabaseManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import kotlinx.coroutines.CoroutineName
import kotlinx.coroutines.DelicateCoroutinesApi
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.delay
import kotlinx.coroutines.newSingleThreadContext
import net.minecraft.core.BlockPos
import net.minecraft.resources.Identifier
Expand Down Expand Up @@ -424,10 +423,6 @@ object DatabaseManager {
}

private suspend fun <T : Any?> execute(body: suspend Transaction.() -> T): T {
while (Ledger.server.overworld()?.noSave != false) {
delay(timeMillis = 1000)
}

return newSuspendedTransaction(context = databaseContext, db = database) {
maxAttempts = MAX_QUERY_RETRIES
minRetryDelay = MIN_RETRY_DELAY
Expand Down Expand Up @@ -479,8 +474,7 @@ object DatabaseManager {
this[Tables.Actions.objectId] = getOrCreateRegistryKeyId(action.objectIdentifier)
this[Tables.Actions.oldObjectId] = getOrCreateRegistryKeyId(action.oldObjectIdentifier)
this[Tables.Actions.world] = getOrCreateWorldId(
action.world ?: Ledger.server.overworld().dimension()
.identifier()
action.world ?: Identifier.fromNamespaceAndPath("minecraft", "overworld")
)
this[Tables.Actions.blockState] = action.objectState
this[Tables.Actions.oldBlockState] = action.oldObjectState
Expand Down