#497 Fixed rightclick not using pass velocity.

Shynixn · Apr 13, 2024 · 658fbec · 658fbec
1 parent 8e83ac0
commit 658fbec
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 8 deletions.
diff --git a/src/main/java/com/github/shynixn/blockball/impl/listener/GameListener.kt b/src/main/java/com/github/shynixn/blockball/impl/listener/GameListener.kt
@@ -69,7 +69,7 @@ class GameListener @Inject constructor(
             return
         }
 
-        if (packet.actionType == InteractionType.RIGHT_CLICK) {
+        if (packet.actionType == InteractionType.RIGHT_CLICK || packet.actionType == InteractionType.OTHER) {
             ball.passByPlayer(event.player)
         } else {
             ball.kickByPlayer(event.player)

diff --git a/src/main/java/com/github/shynixn/blockball/impl/service/HubGameForcefieldServiceImpl.kt b/src/main/java/com/github/shynixn/blockball/impl/service/HubGameForcefieldServiceImpl.kt
@@ -24,6 +24,7 @@ class HubGameForcefieldServiceImpl @Inject constructor(
     private val chatMessageService: ChatMessageService
 ) : HubGameForcefieldService {
     private val cache = HashMap<Player, InteractionCache>()
+
     /**
      * Checks and executes the forcefield actions if the given [player]
      * is going to the given [location].
@@ -77,7 +78,15 @@ class HubGameForcefieldServiceImpl @Inject constructor(
                             val joinCommand = configurationService.findValue<String>("global-join.command")
 
                             val b =
-                                ChatBuilder().text(placeholderService.replacePlaceHolders(game.arena.meta.hubLobbyMeta.joinMessage[0], player, game, null, null))
+                                ChatBuilder().text(
+                                    placeholderService.replacePlaceHolders(
+                                        game.arena.meta.hubLobbyMeta.joinMessage[0],
+                                        player,
+                                        game,
+                                        null,
+                                        null
+                                    )
+                                )
                                     .nextLine()
                                     .component(
                                         placeholderService.replacePlaceHolders(
@@ -88,9 +97,12 @@ class HubGameForcefieldServiceImpl @Inject constructor(
                                         )
                                     )
                                     .setClickAction(
-                                        ChatClickAction.RUN_COMMAND
-                                        ,
-                                        "/" + joinCommand + " " + game.arena.name + "|" + game.arena.meta.redTeamMeta.displayName.stripChatColors()
+                                        ChatClickAction.RUN_COMMAND,
+                                        placeholderService.replacePlaceHolders(
+                                            "/" + joinCommand + " " + game.arena.name + "|" + game.arena.meta.redTeamMeta.displayName.stripChatColors(),
+                                            player,
+                                            game
+                                        )
                                     )
                                     .setHoverText(" ")
                                     .builder().text(" ")
@@ -103,9 +115,12 @@ class HubGameForcefieldServiceImpl @Inject constructor(
                                         )
                                     )
                                     .setClickAction(
-                                        ChatClickAction.RUN_COMMAND
-                                        ,
-                                        "/" + joinCommand + " " + game.arena.name + "|" + game.arena.meta.blueTeamMeta.displayName.stripChatColors()
+                                        ChatClickAction.RUN_COMMAND,
+                                        placeholderService.replacePlaceHolders(
+                                            "/" + joinCommand + " " + game.arena.name + "|" + game.arena.meta.blueTeamMeta.displayName.stripChatColors(),
+                                            player,
+                                            game
+                                        )
                                     )
                                     .setHoverText(" ")
                                     .builder()