Merge changes to master --release

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Release 7.40.3
+
+### Bugs/Issues
+
+* #740 Fixed scoreboard race conditions which could cause players to see a wrong scoreboard.
+
 ## Release 7.40.2
 
 ### Changes

build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "com.github.shynixn"
-version = "7.40.2"
+version = "7.40.3"
 
 repositories {
     mavenCentral()
@@ -30,11 +30,11 @@ dependencies {
 
     // Custom dependencies
     implementation("com.github.shynixn.shycommandsigns:shycommandsigns:1.5.1")
-    implementation("com.github.shynixn.shybossbar:shybossbar:1.7.2")
-    implementation("com.github.shynixn.shyscoreboard:shyscoreboard:1.13.2")
+    implementation("com.github.shynixn.shybossbar:shybossbar:1.7.3")
+    implementation("com.github.shynixn.shyscoreboard:shyscoreboard:1.13.4")
     implementation("com.github.shynixn.shyparticles:shyparticles:1.3.1")
     implementation("com.github.shynixn.shyguild:shyguild:1.1.1")
-    implementation("com.github.shynixn.mcutils:common:2026.7")
+    implementation("com.github.shynixn.mcutils:common:2026.9")
     implementation("com.github.shynixn.mcutils:packet:2026.12")
     implementation("com.github.shynixn.mcutils:worldguard:2026.1")
     implementation("com.github.shynixn.mcutils:database:2026.3")

src/main/java/com/github/shynixn/blockball/impl/service/ForceFieldServiceImpl.kt

@@ -106,9 +106,13 @@ class ForceFieldServiceImpl : ForceFieldService {
     private fun knockBackPlayer(forceField: ForceField, player: Player, modifier: Float) {
         val playerData = playerForceFieldData[player] ?: return
         val knockBack = forceField.center.toVector().subtract(player.location.toVector()).normalize().multiply(modifier)
-        player.velocity = knockBack
-        player.allowFlight = true
         playerData.hasReceivedFlight = true
+        try {
+            player.velocity = knockBack
+            player.allowFlight = true
+        } catch (e: Exception) {
+            // Finite Vector Check
+        }
     }
 
     private fun checkInsideOutSide(player: Player, location: Vector3d, forceField: ForceField) {

src/main/resources/lang/en_us.yml

@@ -481,7 +481,7 @@ shyScoreboardCommonErrorMessage:
   text: "&0&l[&f&lBlockBall&0&l]&7&c A problem occurred. Check the console log for details."
 shyScoreboardCommandSenderHasToBePlayer:
   type: "CHAT"
-  text: "&0&l[&f&lBlockBall&0&l]&7 The command sender has to be a player if you do not specify the optional player argument."
+  text: ""
 shyScoreboardCommandUsage:
   type: "CHAT"
   text: "[&9ShyScoreboard&f] Use /shyscoreboard help to see more info about the plugin."
@@ -547,7 +547,7 @@ shyBossBarCommonErrorMessage:
   text: "&0&l[&f&lBlockBall&0&l]&7&c A problem occurred. Check the console log for details."
 shyBossBarCommandSenderHasToBePlayer:
   type: "CHAT"
-  text: "&0&l[&f&lBlockBall&0&l]&7 The command sender has to be a player if you do not specify the optional player argument."
+  text: ""
 shyBossBarCommandUsage:
   type: "CHAT"
   text: "&0&l[&f&lBlockBall&0&l]&7 Use /blockballbossbar help to see more info about the plugin."

src/main/resources/plugin-1.17.0-1.21.11-folia.yml

@@ -1,5 +1,5 @@
 name: BlockBall
-version: 7.40.2
+version: 7.40.3
 author: Shynixn
 main: com.github.shynixn.blockball.BlockBallPlugin
 softdepend: [ PlaceholderAPI, LuckPerms]

src/main/resources/plugin-1.17.0-1.21.11.yml

@@ -1,5 +1,5 @@
 name: BlockBall
-version: 7.40.2
+version: 7.40.3
 author: Shynixn
 main: com.github.shynixn.blockball.BlockBallPlugin
 softdepend: [ PlaceholderAPI, LuckPerms]

src/main/resources/plugin-1.8.8-1.16.5.yml

@@ -1,5 +1,5 @@
 name: BlockBall
-version: 7.40.2
+version: 7.40.3
 author: Shynixn
 main: com.github.shynixn.blockball.BlockBallPlugin
 softdepend: [ PlaceholderAPI, LuckPerms]

src/main/resources/plugin-26.1.0-latest-folia.yml

@@ -1,5 +1,5 @@
 name: BlockBall
-version: 7.40.2
+version: 7.40.3
 author: Shynixn
 main: com.github.shynixn.blockball.BlockBallPlugin
 softdepend: [ PlaceholderAPI, LuckPerms]

src/main/resources/plugin-26.1.0-latest.yml

@@ -1,5 +1,5 @@
 name: BlockBall
-version: 7.40.2
+version: 7.40.3
 author: Shynixn
 main: com.github.shynixn.blockball.BlockBallPlugin
 softdepend: [ PlaceholderAPI, LuckPerms]