Fix a few editor bugs and other misc issues

BattlePlugins · Aug 3, 2024 · e3e9dd3 · e3e9dd3
1 parent cbc07c0
commit e3e9dd3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/plugin/src/main/java/org/battleplugins/arena/ArenaLoader.java b/plugin/src/main/java/org/battleplugins/arena/ArenaLoader.java
@@ -38,7 +38,7 @@ public void load() {
             this.battleArena.arenas.put(arena.getName(), arena);
 
             // Register command
-            PluginCommand command = this.battleArena.getCommand(arena.getName().toUpperCase(Locale.ROOT));
+            PluginCommand command = this.battleArena.getCommand(arena.getName().toLowerCase(Locale.ROOT));
 
             ArenaCommandExecutor executor = arena.createCommandExecutor();
             ArenaCreateExecutorEvent event = new ArenaCreateExecutorEvent(arena, executor);

diff --git a/plugin/src/main/java/org/battleplugins/arena/BattleArena.java b/plugin/src/main/java/org/battleplugins/arena/BattleArena.java
@@ -644,7 +644,7 @@ private void loadArenaLoaders(Path path) {
                     Configuration configuration = YamlConfiguration.loadConfiguration(Files.newBufferedReader(arenaPath));
                     String name = configuration.getString("name");
                     if (name == null) {
-                        this.info("Arena {} does not have a name!", arenaPath.getFileName());
+                        this.warn("Arena {} does not have a name!", arenaPath.getFileName());
                         return;
                     }
 

diff --git a/plugin/src/main/java/org/battleplugins/arena/editor/ArenaEditorWizard.java b/plugin/src/main/java/org/battleplugins/arena/editor/ArenaEditorWizard.java
@@ -143,6 +143,8 @@ public void openSingleWizardStage(Player player, Arena arena, WizardStage<E> sta
         });
 
         stage.enter(context);
+
+        player.setMetadata(EDITOR_META_KEY, new FixedMetadataValue(this.plugin, context));
     }
 
     @Nullable

diff --git a/plugin/src/main/java/org/battleplugins/arena/editor/stage/TeamSpawnInputStage.java b/plugin/src/main/java/org/battleplugins/arena/editor/stage/TeamSpawnInputStage.java
@@ -12,6 +12,7 @@
 import org.bukkit.entity.Player;
 
 import java.util.List;
+import java.util.Locale;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -79,7 +80,7 @@ public void onChatInput(String input) {
 
                 List<String> teamNames = context.getArena().getTeams().getAvailableTeams()
                         .stream()
-                        .map(ArenaTeam::getName)
+                        .map(team -> team.getName().toLowerCase(Locale.ROOT))
                         .toList();
 
                 Component teamsList = Component.join(JoinConfiguration.commas(true), validTeamNames);
@@ -105,7 +106,7 @@ public void onChatInput(String input) {
 
                     @Override
                     public boolean isValidChatInput(String input) {
-                        return super.isValidChatInput(input) && (!input.startsWith("/") && teamNames.contains(input));
+                        return super.isValidChatInput(input) && (!input.startsWith("/") && teamNames.contains(input.toLowerCase(Locale.ROOT)));
                     }
                 }.bind(context);
             }
@@ -116,4 +117,4 @@ public boolean isValidChatInput(String input) {
             }
         }.bind(context);
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up @@
             });
             stage.enter(context);
+            player.setMetadata(EDITOR_META_KEY, new FixedMetadataValue(this.plugin, context));
         }
         @Nullable
@@ Expand Down @@