Update CommandAPIBukkit#registerCommandNode()

DerEchtePilz · willkroboth · DerEchtePilz · commit 1ae6fc11d4ee · 2024-01-06T17:41:48.000+01:00
Co-authored-by: willkroboth &lt;46540330+willkroboth@users.noreply.github.com&gt;
diff --git a/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-core/src/main/java/dev/jorel/commandapi/CommandAPIBukkit.java b/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-core/src/main/java/dev/jorel/commandapi/CommandAPIBukkit.java
@@ -566,31 +566,27 @@ private void registerCommand(RootCommandNode<Source> root, String name, String p
 
 	@Override
 	public LiteralCommandNode<Source> registerCommandNode(LiteralArgumentBuilder<Source> node, String namespace) {
+		RootCommandNode<Source> rootNode = getBrigadierDispatcher().getRoot();
 		LiteralCommandNode<Source> builtNode = node.build();
-		LiteralCommandNode<Source> customNamespaceNode = null;
-
 		String name = node.getLiteral();
-		boolean namespaceEqualsMinecraft = namespace.equals("minecraft");
-		if (namespaceEqualsMinecraft && namespacesToFix.contains("minecraft:" + name)) {
+		if (namespace.equals("minecraft") && namespacesToFix.contains("minecraft:" + name)) {
 			// This command wants to exist as `minecraft:name`
 			// However, another command has requested that `minecraft:name` be removed
 			// We'll keep track of everything that should be `minecraft:name` in
 			//  `minecraftCommandNamespaces` and fix this later in `#fixNamespaces`
 			minecraftCommandNamespaces.addChild(CommandAPIHandler.getInstance().namespaceNode(builtNode, "minecraft"));
-		} else if (!namespaceEqualsMinecraft) {
-			// We should set up a custom namespace
-			customNamespaceNode = CommandAPIHandler.getInstance().namespaceNode(builtNode, namespace);
+		} else {
 			// Make sure to remove the `minecraft:name` and
 			//  `minecraft:namespace:name` commands Bukkit will create
 			fillNamespacesToFix(name, namespace + ":" + name);
+			// Create the namespaced node
+			rootNode.addChild(CommandAPIHandler.getInstance().namespaceNode(builtNode, namespace));
 		}
-
-		// Add the nodes to the main dispatcher
-		RootCommandNode<Source> rootNode = getBrigadierDispatcher().getRoot();
+		// Add the main node to dispatcher
+		//  We needed to wait until after `fillNamespacesToFix` was called to do this, in case a previous
+		//  `minecraft:name` version of the command needed to be saved separately before this node was added
 		rootNode.addChild(builtNode);
-		if (customNamespaceNode != null) {
-			rootNode.addChild(customNamespaceNode);
-		}
+
 		return builtNode;
 	}
 
