From 40fb574a8b16785bc03b8902ce82641a89d91cc3 Mon Sep 17 00:00:00 2001
From: Dragon Fire <danielbodendahl@gmail.com>
Date: Sat, 5 Jun 2021 18:31:14 -0400
Subject: [PATCH] Fix

---
 framework/Command.js    |  2 +-
 framework/Dispatcher.js | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/framework/Command.js b/framework/Command.js
index efd27e2f..59abff35 100644
--- a/framework/Command.js
+++ b/framework/Command.js
@@ -38,7 +38,7 @@ module.exports = class Command {
 
 	usage() {
 		const args = this.args
-			.map(arg => `${arg.default ? '[' : '<'}${arg.label || arg.name}${arg.default ? ']' : '>'}`).join(' ');
+			.map(arg => `${arg.default ? '[' : '<'}${arg.label || arg.key}${arg.default ? ']' : '>'}`).join(' ');
 		return `\`${this.client.commandPrefix}${this.name} ${args}\` or \`@${this.client.user.tag} ${this.name} ${args}\``;
 	}
 
diff --git a/framework/Dispatcher.js b/framework/Dispatcher.js
index 27da31ed..e09150cc 100644
--- a/framework/Dispatcher.js
+++ b/framework/Dispatcher.js
@@ -43,31 +43,31 @@ module.exports = class CommandDispatcher {
 				for (const parsedArg of infinite) {
 					if (arg.isEmpty(parsedArg, msg, arg)) {
 						if (arg.default) {
-							finalResult[arg.name] = typeof arg.default === 'function' ? arg.default(msg) : arg.default;
-							continue;
+							finalResult[arg.key] = typeof arg.default === 'function' ? arg.default(msg) : arg.default;
+							break;
 						} else {
-							return `The "${arg.label || arg.name}" argument is required.`;
+							return `The "${arg.label || arg.key}" argument is required.`;
 						}
 					}
 					const valid = await arg.validate(parsedArg, msg, arg);
-					if (!valid) return `An invalid value was provided for one of the "${arg.label || arg.name}" arguments.`;
+					if (!valid) return `An invalid value was provided for one of the "${arg.label || arg.key}" arguments.`;
 					parsedArgs.push(await arg.parse(parsedArg, msg, arg));
 				}
-				finalResult[arg.name] = parsedArgs;
+				finalResult[arg.key] = parsedArgs;
 				break;
 			}
 			const parsedArg = parsed._[i];
 			if (arg.isEmpty(parsedArg, msg, arg)) {
 				if (arg.default) {
-					finalResult[arg.name] = typeof arg.default === 'function' ? arg.default(msg) : arg.default;
+					finalResult[arg.key] = typeof arg.default === 'function' ? arg.default(msg) : arg.default;
 					continue;
 				} else {
-					return `The "${arg.label || arg.name}" argument is required.`;
+					return `The "${arg.label || arg.key}" argument is required.`;
 				}
 			}
 			const valid = await arg.validate(parsedArg, msg, arg);
-			if (!valid) return `An invalid value was provided for the "${arg.label || arg.name}" argument.`;
-			finalResult[arg.name] = await arg.parse(parsedArg, msg, arg);
+			if (!valid) return `An invalid value was provided for the "${arg.label || arg.key}" argument.`;
+			finalResult[arg.key] = await arg.parse(parsedArg, msg, arg);
 		}
 		return { command, args: finalResult };
 	}