Skip to content

Commit

Permalink
#patch General optimization (#73)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
3 people authored Apr 23, 2024
1 parent 9e59f61 commit 93a2b39
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 11 deletions.
4 changes: 4 additions & 0 deletions .github/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy-development.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ 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")
compileOnly(files("lib/CorpseReborn.jar"))
}

group = "plugily.projects"
version = "2.0.6"
version = "2.0.6-SNAPSHOT2"
description = "MurderMystery"

java {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/language.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/locales/language_default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 93a2b39

Please sign in to comment.