Refactoring

missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/GameJoinManager.java

@@ -200,43 +200,42 @@ public class GameJoinManager {
     private void sendJoinBroadcastMsg(MWPlayer mwPlayer) {
         Player player = mwPlayer.getPlayer();
         
-        String broadcastMsg = null;
+        String broadcastMsg;
         if (game.getState() == GameState.LOBBY) {
             broadcastMsg = Messages.getMessage(true, Messages.MessageEnum.LOBBY_PLAYER_JOINED);
-        } else if ((game.getState() == GameState.INGAME) || (game.getState() == GameState.END)) {
+        } else {
             broadcastMsg = Messages.getMessage(true, Messages.MessageEnum.GAME_PLAYER_JOINED);
         }
         
-        if (broadcastMsg != null) {
-            game.broadcast(broadcastMsg.replace("%max_players%", Integer.toString(game.getLobby().getMaxPlayers()))
-                    .replace("%players%", Integer.toString(game.getPlayerAmount()))
-                    .replace("%player%", player.getName())
-                    .replace("%team%", (mwPlayer.getTeam() != null) ? mwPlayer.getTeam().getFullname() : "?"));
-        }
+        game.broadcast(broadcastMsg.replace("%max_players%", Integer.toString(game.getLobby().getMaxPlayers()))
+                .replace("%players%", Integer.toString(game.getPlayerAmount()))
+                .replace("%player%", player.getName())
+                .replace("%team%", (mwPlayer.getTeam() != null) ? mwPlayer.getTeam().getFullname() : "?"));
     }
     
     public void sendJoinPrivateMsg(MWPlayer mwPlayer, boolean isTeamSwitch) {
         Player player = mwPlayer.getPlayer();
         
+        String privateMsg;
         if (mwPlayer.getTeam() == teamManager.getTeamSpec()) {
-
             if (isTeamSwitch) {
-                player.sendMessage(Messages.getMessage(true, Messages.MessageEnum.TEAM_SPECTATOR_TEAM_SWITCH)
-                        .replace("%team%", mwPlayer.getTeam().getFullname()));
+                privateMsg = Messages.getMessage(true, Messages.MessageEnum.TEAM_SPECTATOR_TEAM_SWITCH);
             } else {
-                player.sendMessage(Messages.getMessage(true, Messages.MessageEnum.TEAM_SPECTATOR_TEAM_ASSIGNED)
-                        .replace("%team%", mwPlayer.getTeam().getFullname()));
+                privateMsg = Messages.getMessage(true, Messages.MessageEnum.TEAM_SPECTATOR_TEAM_ASSIGNED);
             }
             
         } else {
             if (isTeamSwitch) {
-                player.sendMessage(Messages.getMessage(true, Messages.MessageEnum.TEAM_PLAYER_TEAM_SWITCH)
-                        .replace("%team%", mwPlayer.getTeam().getFullname()));
+                privateMsg = Messages.getMessage(true, Messages.MessageEnum.TEAM_PLAYER_TEAM_SWITCH);
             } else {
-                player.sendMessage(Messages.getMessage(true, Messages.MessageEnum.TEAM_PLAYER_TEAM_ASSIGNED)
-                        .replace("%team%", mwPlayer.getTeam().getFullname()));
+                privateMsg = Messages.getMessage(true, Messages.MessageEnum.TEAM_PLAYER_TEAM_ASSIGNED);
             }
         }
+        
+        player.sendMessage(privateMsg.replace("%max_players%", Integer.toString(game.getLobby().getMaxPlayers()))
+                .replace("%players%", Integer.toString(game.getPlayerAmount()))
+                .replace("%player%", player.getName())
+                .replace("%team%", (mwPlayer.getTeam() != null) ? mwPlayer.getTeam().getFullname() : "?"));
     }
 
     private void getGameJoinMenu(MWPlayer mwPlayer) {