From 78912115245b9bed2ad35ea16d595219cf89d4bd Mon Sep 17 00:00:00 2001 From: Mester Date: Fri, 6 Mar 2026 20:26:43 +0100 Subject: [PATCH 1/3] Update Maven repository for Infernal Suite Replaced the Rapture repository URL with the Infernal Suite releases repository. --- pgame-plugin/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pgame-plugin/build.gradle.kts b/pgame-plugin/build.gradle.kts index 4c217c5..6f72e8c 100644 --- a/pgame-plugin/build.gradle.kts +++ b/pgame-plugin/build.gradle.kts @@ -14,7 +14,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/") maven("https://repo.extendedclip.com/releases/") maven("https://simonsator.de/repo/") From ea03e8cd64e6851f95d1166b09fa20e72b31e303 Mon Sep 17 00:00:00 2001 From: Mester Date: Fri, 6 Mar 2026 20:27:21 +0100 Subject: [PATCH 2/3] Update Maven repository for Infernal Suite Replaced the Rapture repository URL with Infernal Suite releases. --- pgame-api/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pgame-api/build.gradle.kts b/pgame-api/build.gradle.kts index c8ab6d4..0f53333 100644 --- a/pgame-api/build.gradle.kts +++ b/pgame-api/build.gradle.kts @@ -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/") } From c86acd0ea35b68374717a56102a34038a3a23119 Mon Sep 17 00:00:00 2001 From: MesterMan03 Date: Fri, 6 Mar 2026 20:45:11 +0100 Subject: [PATCH 3/3] fix build errors, clean up build.gradle.kts, fix NullPointerException when calling /admin end after the last minigame --- pgame-api/build.gradle.kts | 4 ++-- .../main/kotlin/info/mester/network/partygames/api/Game.kt | 3 +++ pgame-plugin/build.gradle.kts | 6 +----- test-minigame/build.gradle.kts | 4 ++-- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pgame-api/build.gradle.kts b/pgame-api/build.gradle.kts index 0f53333..1bb9614 100644 --- a/pgame-api/build.gradle.kts +++ b/pgame-api/build.gradle.kts @@ -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 @@ -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 { diff --git a/pgame-api/src/main/kotlin/info/mester/network/partygames/api/Game.kt b/pgame-api/src/main/kotlin/info/mester/network/partygames/api/Game.kt index a0c769d..c6d379e 100644 --- a/pgame-api/src/main/kotlin/info/mester/network/partygames/api/Game.kt +++ b/pgame-api/src/main/kotlin/info/mester/network/partygames/api/Game.kt @@ -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() diff --git a/pgame-plugin/build.gradle.kts b/pgame-plugin/build.gradle.kts index 6f72e8c..d90900b 100644 --- a/pgame-plugin/build.gradle.kts +++ b/pgame-plugin/build.gradle.kts @@ -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 @@ -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.infernalsuite.com/repository/maven-releases/") - maven("https://repo.infernalsuite.com/repository/maven-snapshots/") maven("https://repo.extendedclip.com/releases/") maven("https://simonsator.de/repo/") } @@ -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 diff --git a/test-minigame/build.gradle.kts b/test-minigame/build.gradle.kts index fc7b5f8..b847219 100644 --- a/test-minigame/build.gradle.kts +++ b/test-minigame/build.gradle.kts @@ -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 } @@ -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 {