Skip to content

Fix/update asp maven #3

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

Merged
MesterMan03 merged 3 commits into from
Mar 6, 2026
Merged

Fix/update asp maven #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7891211
Update Maven repository for Infernal Suite
MesterMan03 Mar 6, 2026
ea03e8c
Update Maven repository for Infernal Suite
MesterMan03 Mar 6, 2026
c86acd0
fix build errors, clean up build.gradle.kts, fix NullPointerException…
MesterMan03 Mar 6, 2026
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
6 changes: 3 additions & 3 deletions pgame-api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("com.gradleup.shadow") version "9.3.0"
id("com.gradleup.shadow") version "9.0.0-beta8"
id("io.papermc.paperweight.userdev")
id("org.jetbrains.dokka") version "2.0.0"
java
Expand All @@ -12,7 +12,7 @@ repositories {
maven("https://repo.papermc.io/repository/maven-public/")
maven("https://oss.sonatype.org/content/groups/public/")
maven("https://maven.enginehub.org/repo/")
maven("https://repo.rapture.pw/repository/maven-releases/")
maven("https://repo.infernalsuite.com/repository/maven-releases/")
maven("https://repo.infernalsuite.com/repository/maven-snapshots/")
}

Expand All @@ -21,7 +21,7 @@ dependencies {
implementation(kotlin("reflect"))

paperweight.paperDevBundle("1.21.11-R0.1-SNAPSHOT")
compileOnly("com.infernalsuite.asp:api:4.0.0-SNAPSHOT")
compileOnly("com.infernalsuite.asp:api:4.2.0-SNAPSHOT")
}
val targetJavaVersion = 21
kotlin {
Expand Down
3 changes: 3 additions & 0 deletions pgame-api/src/main/kotlin/info/mester/network/partygames/api/Game.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,9 @@ class Game(
* Gracefully shut down the game (used when the game has to be ended without announcing the winners)
*/
fun terminate() {
if(_state == GameState.STOPPED) {
return
}
_state = GameState.STOPPED
// this could be the case if we forcefully end the tournament with the command
runningMinigame?.terminate()
Expand Down
6 changes: 1 addition & 5 deletions pgame-plugin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import com.diffplug.spotless.LineEnding

plugins {
id("com.gradleup.shadow") version "9.3.0"
id("com.gradleup.shadow") version "9.0.0-beta8"
id("io.papermc.paperweight.userdev")
id("com.diffplug.spotless") version "7.0.2"
java
Expand All @@ -14,8 +14,6 @@ repositories {
maven("https://repo.papermc.io/repository/maven-public/")
maven("https://oss.sonatype.org/content/groups/public/")
maven("https://maven.enginehub.org/repo/")
maven("https://repo.rapture.pw/repository/maven-releases/")
maven("https://repo.infernalsuite.com/repository/maven-snapshots/")
maven("https://repo.extendedclip.com/releases/")
maven("https://simonsator.de/repo/")
}
Expand All @@ -30,8 +28,6 @@ dependencies {
implementation(platform("com.intellectualsites.bom:bom-newest:1.52"))
compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Core")
compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit") { isTransitive = false }
// AdvancedSlimePaper
// compileOnly("com.infernalsuite.asp:api:4.0.0-SNAPSHOT")
// Testing
testImplementation(kotlin("test"))
// ScoreboardLibrary
Expand Down
4 changes: 2 additions & 2 deletions test-minigame/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("com.github.johnrengelman.shadow") version "8.1.1"
id("com.gradleup.shadow") version "9.0.0-beta8"
id("io.papermc.paperweight.userdev")
java
}
Expand All @@ -17,7 +17,7 @@ dependencies {
implementation(kotlin("reflect"))
compileOnly(project(":pgame-api"))

paperweight.paperDevBundle("1.21.4-R0.1-SNAPSHOT")
paperweight.paperDevBundle("1.21.11-R0.1-SNAPSHOT")
}
val targetJavaVersion = 21
kotlin {
Expand Down
Loading