Some fixes

arkflame · Oct 20, 2021 · 8b4e5e6 · 8b4e5e6
1 parent 84cbc9e
commit 8b4e5e6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Improved sixth (6th) game.
+- Added warning error if translation key doesn't exist.
 
 ### Fixed
 

diff --git a/src/main/java/dev/_2lstudios/squidgame/arena/Arena.java b/src/main/java/dev/_2lstudios/squidgame/arena/Arena.java
@@ -66,8 +66,8 @@ public void resetArena() {
         this.spectators.clear();
         this.games.clear();
 
-        this.games.add(new G6GlassesGame(this, mainConfig.getInt("game-settings.game-time.6", 60)));
         this.games.add(new G1RedGreenLightGame(this, mainConfig.getInt("game-settings.game-time.1", 60)));
+        this.games.add(new G6GlassesGame(this, mainConfig.getInt("game-settings.game-time.6", 60)));
         this.games.add(new G7SquidGame(this, mainConfig.getInt("game-settings.game-time.7", 600)));
     }
 

diff --git a/src/main/java/dev/_2lstudios/squidgame/gui/EditArenaGame6GUI.java b/src/main/java/dev/_2lstudios/squidgame/gui/EditArenaGame6GUI.java
@@ -25,7 +25,7 @@ public void init() {
         this.addItem(0, this.createItem("§eSpawn point", Material.COMPASS, "§r\n§7Set at your current location\n§r"), 3,
                 2);
         this.addItem(1, this.createItem("§eGlass Zone", Material.GLASS, "§r\n§7Set with your location wand\n§r"), 5, 2);
-        this.addItem(1, this.createItem("§eGoal Zone", Material.ARMOR_STAND, "§r\n§7Set with your location wand\n§r"),
+        this.addItem(2, this.createItem("§eGoal Zone", Material.ARMOR_STAND, "§r\n§7Set with your location wand\n§r"),
                 7, 2);
 
         this.addItem(99, this.createItem("§cBack", Material.BARRIER), 5, 4);

diff --git a/src/main/java/dev/_2lstudios/squidgame/player/SquidPlayer.java b/src/main/java/dev/_2lstudios/squidgame/player/SquidPlayer.java
@@ -68,7 +68,10 @@ public String getI18n(final String key) {
 
     private String formatMessage(final String message) {
         final String translatedMessage = this.getI18n(message);
-        final String formatColor = ChatColor.translateAlternateColorCodes('&', translatedMessage);
+        final String formatColor = ChatColor.translateAlternateColorCodes('&',
+                translatedMessage == null
+                        ? "§6§lWARNING: §eMissing translation key §7" + message + " §ein message.yml file"
+                        : translatedMessage);
         final String replacedVariables = PlaceholderAPIHook.formatString(formatColor, this.getBukkitPlayer());
         return replacedVariables;
     }