From 8b0f5dd6e82e71274db533589fd289cb35e79cee Mon Sep 17 00:00:00 2001 From: Shynixn Date: Tue, 23 Jul 2024 21:03:15 +0200 Subject: [PATCH] #532 Fixed backteleporting in minigame mode. --- build.gradle.kts | 2 +- docs/source/conf.py | 4 ++-- .../github/shynixn/blockball/impl/BlockBallMiniGameImpl.kt | 2 ++ src/main/resources/plugin-legacy.yml | 2 +- src/main/resources/plugin.yml | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 70fa17e99..e025e32c8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } group = "com.github.shynixn" -version = "6.46.1" +version = "6.46.2" repositories { mavenLocal() diff --git a/docs/source/conf.py b/docs/source/conf.py index 71281aaad..47086314b 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -55,9 +55,9 @@ # built documents. # # The short X.Y version. -version = '6.46.1' +version = '6.46.2' # The full version, including alpha/beta/rc tags. -release = '6.46.1' +release = '6.46.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/src/main/java/com/github/shynixn/blockball/impl/BlockBallMiniGameImpl.kt b/src/main/java/com/github/shynixn/blockball/impl/BlockBallMiniGameImpl.kt index d6eee89c0..77ad60308 100644 --- a/src/main/java/com/github/shynixn/blockball/impl/BlockBallMiniGameImpl.kt +++ b/src/main/java/com/github/shynixn/blockball/impl/BlockBallMiniGameImpl.kt @@ -181,10 +181,12 @@ class BlockBallMiniGameImpl constructor( if (team == Team.RED && redTeam.size < arena.meta.redTeamMeta.maxAmount) { joinTeam(player, team, arena.meta.redTeamMeta) storage.team = team + storage.goalTeam = team joinResult = JoinResult.SUCCESS_RED } else if (team == Team.BLUE && blueTeam.size < arena.meta.blueTeamMeta.maxAmount) { joinTeam(player, team, arena.meta.blueTeamMeta) storage.team = team + storage.goalTeam = team joinResult = JoinResult.SUCCESS_BLUE } } diff --git a/src/main/resources/plugin-legacy.yml b/src/main/resources/plugin-legacy.yml index 44318b82c..44be0102e 100644 --- a/src/main/resources/plugin-legacy.yml +++ b/src/main/resources/plugin-legacy.yml @@ -1,5 +1,5 @@ name: BlockBall -version: 6.46.1 +version: 6.46.2 author: Shynixn website: https://www.spigotmc.org/members/shynixn.63455/ main: com.github.shynixn.blockball.BlockBallPlugin diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 31710df6f..ba9ad8eae 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: BlockBall -version: 6.46.1 +version: 6.46.2 author: Shynixn website: https://www.spigotmc.org/members/shynixn.63455/ main: com.github.shynixn.blockball.BlockBallPlugin