From 93a2b3988b0b9006c9ec9e5af42b5c1fe98cf0e4 Mon Sep 17 00:00:00 2001 From: Tigerpanzer_02 <37453987+Tigerpanzer02@users.noreply.github.com> Date: Wed, 24 Apr 2024 01:21:56 +0200 Subject: [PATCH] #patch General optimization (#73) * Bump version from 2.0.6 to 2.0.6-SNAPSHOT0 * Fixed bug where the murderer gets teleported to the lobby to fast when arena ends (#72) * Bump version from 2.0.6-SNAPSHOT0 to 2.0.6-SNAPSHOT1 * Updated to minigamesbox 1.3.8 * Bump version from 2.0.6-SNAPSHOT1 to 2.0.6-SNAPSHOT2 --------- Co-authored-by: version-bump[github-action] <41898282+version-bump[github-action]@users.noreply.github.com> Co-authored-by: EpicJosch <50040609+EpicJosch@users.noreply.github.com> --- .github/CHANGELOG.md | 4 ++++ .github/workflows/deploy-development.yml | 6 +++--- .github/workflows/deploy-master.yml | 6 +++--- build.gradle.kts | 4 ++-- .../plugily/projects/murdermystery/arena/ArenaEvents.java | 2 +- src/main/resources/language.yml | 2 +- src/main/resources/locales/language_default.yml | 2 +- 7 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index 9a843336..dc5e4677 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -1,3 +1,7 @@ +### 2.0.7 Release (24.04.2024) +* Fixed bug where the murderer gets teleported to the lobby to fast when arena ends +* Updated to minigamesbox 1.3.8 + ### 2.0.6 Release (15.01.2024) * Fixed Hungerlose option in config.yml * Changed Round chances are now full numbers (no ,xx) diff --git a/.github/workflows/deploy-development.yml b/.github/workflows/deploy-development.yml index 92f16b11..bc5e3f6c 100644 --- a/.github/workflows/deploy-development.yml +++ b/.github/workflows/deploy-development.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Latest Commit - uses: actions/checkout@v3 + uses: actions/checkout@v4.1.3 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Bump Version @@ -25,11 +25,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Latest Commit - uses: actions/checkout@v3 + uses: actions/checkout@v4.1.3 with: ref: 'development' - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4.2.1 with: distribution: 'temurin' java-version: '17' diff --git a/.github/workflows/deploy-master.yml b/.github/workflows/deploy-master.yml index 143add43..b074dff0 100644 --- a/.github/workflows/deploy-master.yml +++ b/.github/workflows/deploy-master.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Latest Commit - uses: actions/checkout@v3 + uses: actions/checkout@v4.1.3 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Bump Version @@ -28,11 +28,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Latest Commit - uses: actions/checkout@v3 + uses: actions/checkout@v4.1.3 with: ref: 'master' - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4.2.1 with: distribution: 'temurin' java-version: '17' diff --git a/build.gradle.kts b/build.gradle.kts index e9105c5f..dc6f837e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,7 +17,7 @@ repositories { } dependencies { - implementation("plugily.projects:MiniGamesBox-Classic:1.3.7") { isTransitive = false } + implementation("plugily.projects:MiniGamesBox-Classic:1.3.8") { isTransitive = false } compileOnly("org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT") compileOnly("io.papermc.paper:paper-api:1.19.3-R0.1-SNAPSHOT") compileOnly("org.jetbrains:annotations:24.0.1") @@ -25,7 +25,7 @@ dependencies { } group = "plugily.projects" -version = "2.0.6" +version = "2.0.6-SNAPSHOT2" description = "MurderMystery" java { diff --git a/src/main/java/plugily/projects/murdermystery/arena/ArenaEvents.java b/src/main/java/plugily/projects/murdermystery/arena/ArenaEvents.java index 1648d35e..1c8aef4e 100644 --- a/src/main/java/plugily/projects/murdermystery/arena/ArenaEvents.java +++ b/src/main/java/plugily/projects/murdermystery/arena/ArenaEvents.java @@ -421,7 +421,7 @@ public void onRespawn(PlayerRespawnEvent event) { event.setRespawnLocation(arena.getLobbyLocation()); return; } - if(arena.getArenaState() == ArenaState.ENDING || arena.getArenaState() == ArenaState.RESTARTING) { + if(arena.getArenaState() == ArenaState.RESTARTING) { event.setRespawnLocation(arena.getEndLocation()); return; } diff --git a/src/main/resources/language.yml b/src/main/resources/language.yml index 72b06330..1b7c2794 100644 --- a/src/main/resources/language.yml +++ b/src/main/resources/language.yml @@ -190,7 +190,7 @@ In-Game: # Join cancelled via external plugin that uses the API of our plugin. Cancelled-Via-API: "%color_chat_issue%%plugin_prefix% You can't join this game!" As-Party-Member: "%color_chat_issue%%plugin_prefix% You joined %arena_name% because the party leader joined it!" - Arena-Not-Configured: "%color_chat_issue%%plugin_prefix% Arena is not configured yet! Contact staff!" + Arena-Not-Configured: "%color_chat_issue%%plugin_prefix% Arena is not configured yet! Contact your server's staff!" Title: "20,30,20;%arena_name%;%arena_players_size%/%arena_max_players%" Death: Tag: "&8Dead" diff --git a/src/main/resources/locales/language_default.yml b/src/main/resources/locales/language_default.yml index c8a798a7..84d7425e 100644 --- a/src/main/resources/locales/language_default.yml +++ b/src/main/resources/locales/language_default.yml @@ -201,7 +201,7 @@ In-Game: # Join cancelled via external plugin that uses the API of our plugin. Cancelled-Via-API: "%color_chat_issue%%plugin_prefix% You can't join this game!" As-Party-Member: "%color_chat_issue%%plugin_prefix% You joined %arena_name% because the party leader joined it!" - Arena-Not-Configured: "%color_chat_issue%%plugin_prefix% Arena is not configured yet! Contact staff!" + Arena-Not-Configured: "%color_chat_issue%%plugin_prefix% Arena is not configured yet! Contact your server's staff!" Title: "20,30,20;%arena_name%;%arena_players_size%/%arena_max_players%" Death: Tag: "&8Dead"