Skip to content
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

fix multiple click event #59

Merged
merged 1 commit into from
Dec 17, 2024
Merged

fix multiple click event #59

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ makeevrserg.java.ktarget=21
# Project
makeevrserg.project.name=AstraMarket
makeevrserg.project.group=ru.astrainteractive.astramarket
makeevrserg.project.version.string=1.17.2
makeevrserg.project.version.string=1.17.3
makeevrserg.project.description=Market plugin for EmpireSMP
makeevrserg.project.developers=makeevrserg|Makeev Roman|[email protected]
makeevrserg.project.url=https://empireprojekt.ru
6 changes: 4 additions & 2 deletions modules/api-market/src/main/kotlin/ru/astrainteractive/astramarket/di/ApiMarketModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
package ru.astrainteractive.astramarket.di

import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.NonCancellable
import kotlinx.coroutines.cancel
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.launch
import kotlinx.serialization.StringFormat
import org.jetbrains.exposed.sql.Database
import org.jetbrains.exposed.sql.SchemaUtils
Expand Down Expand Up @@ -71,7 +73,7 @@ interface ApiMarketModule {
onEnable = {
},
onDisable = {
runBlocking {
GlobalScope.launch(NonCancellable) {
databaseFlow.first().run(TransactionManager::closeAndUnregister)
}
scope.cancel()
Expand Down
7 changes: 6 additions & 1 deletion spigot/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,12 @@ astraShadowJar {
mergeServiceFiles()
dependsOn(configurations)
archiveClassifier.set(null as String?)
relocate("org.bstats", projectInfo.group)
listOf(
"org.bstats",
"kotlin",
"org.jetbrains",
"ru.astrainteractive.astralibs"
).forEach { pattern -> relocate(pattern, "${projectInfo.group}.$pattern") }

minimize {
exclude(dependency(libs.exposed.jdbc.get()))
Expand Down
1 change: 0 additions & 1 deletion spigot/src/main/kotlin/ru/astrainteractive/astramarket/di/RootModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ internal interface RootModule {

private val lifecycles: List<Lifecycle>
get() = listOf(
coreModule.lifecycle,
coreModule.lifecycle,
apiMarketModule.lifecycle,
commandModule.lifecycle,
Expand Down
Loading