Pārlūkot izejas kodu

Fixing 'invalid_shield' msg, adding '%input%' argument for 'invalid_game' msg

RedstoneFuture 1 gadu atpakaļ
vecāks
revīzija
5bd3e6cd22

+ 6 - 3
missilewars-plugin/src/main/java/de/butzlabben/missilewars/commands/MWCommands.java

@@ -139,7 +139,8 @@ public class MWCommands extends BaseCommand {
         if (args.length == 1) {
             game = GameManager.getInstance().getGame(args[0]);
             if (game == null) {
-                player.sendMessage(Messages.getMessage(true, Messages.MessageEnum.COMMAND_INVALID_GAME));
+                player.sendMessage(Messages.getMessage(true, Messages.MessageEnum.COMMAND_INVALID_GAME)
+                        .replace("%input%", args[0]));
                 return;
             }
         } else {
@@ -186,7 +187,8 @@ public class MWCommands extends BaseCommand {
         if (args.length == 1) {
             game = GameManager.getInstance().getGame(args[0]);
             if (game == null) {
-                player.sendMessage(Messages.getMessage(true, Messages.MessageEnum.COMMAND_INVALID_GAME));
+                player.sendMessage(Messages.getMessage(true, Messages.MessageEnum.COMMAND_INVALID_GAME)
+                        .replace("%input%", args[0]));
                 return;
             }
         } else {
@@ -220,7 +222,8 @@ public class MWCommands extends BaseCommand {
         if (args.length == 1) {
             game = GameManager.getInstance().getGame(args[0]);
             if (game == null) {
-                player.sendMessage(Messages.getMessage(true, Messages.MessageEnum.COMMAND_INVALID_GAME));
+                player.sendMessage(Messages.getMessage(true, Messages.MessageEnum.COMMAND_INVALID_GAME)
+                        .replace("%input%", args[0]));
                 return;
             }
         } else {

+ 2 - 3
missilewars-plugin/src/main/java/de/butzlabben/missilewars/configuration/Messages.java

@@ -95,9 +95,8 @@ public class Messages {
         COMMAND_MAP_NEEDED("command.map_needed", "&cPlease specify the map."),
         COMMAND_TEAM_NUMBER_NEEDED("command.team_number_needed", "&cPlease specify the team number."),
         COMMAND_INVALID_MISSILE("command.invalid_missile", "&cThe specified missile %input% was not found."),
-        COMMAND_INVALID_SHIELD("command.invalid_missile", "&cThe specified shield %input% was not found."),
-        COMMAND_MISSILE_NEEDED("command.missile_needed", "&cPlease specify the missile."),
-        COMMAND_INVALID_GAME("command.invalid_game", "&cThe specified game was not found."),
+        COMMAND_INVALID_SHIELD("command.invalid_shield", "&cThe specified shield %input% was not found."),
+        COMMAND_INVALID_GAME("command.invalid_game", "&cThe specified game %input% was not found."),
         COMMAND_INVALID_MAP("command.invalid_map", "&cThe specified map %input% was not found."),
         COMMAND_INVALID_TEAM_NUMBER("command.invalid_team_number", "&cThe team number is invalid. Use \"1\" or \"2\" to specify the target team."),