From 172bddf731c40c9df29306406098073d0e595b6b Mon Sep 17 00:00:00 2001
From: Imbris <imbrisf@gmail.com>
Date: Fri, 30 Jul 2021 01:22:00 -0400
Subject: [PATCH] Make admin add/remove command arguments positional again

---
 CHANGELOG.md          | 1 +
 server-cli/src/cli.rs | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4845b4b3ab..f838d0d80f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Mushroom Curry gives long-lasting Regeneration buff
 - Trades now consider if items can stack in full inventories.
 - The types of animals that can be tamed as pets are now limited to certain species, pending further balancing of pets
+- Made server-cli admin add/remove command use positional arguments again
 
 ### Removed
 
diff --git a/server-cli/src/cli.rs b/server-cli/src/cli.rs
index 421ac93b5d..c416e3db45 100644
--- a/server-cli/src/cli.rs
+++ b/server-cli/src/cli.rs
@@ -8,15 +8,13 @@ use tracing::error;
 pub enum Admin {
     /// Adds an admin
     Add {
-        #[structopt(short, long)]
         /// Name of the admin to whom to assign a role
         username: String,
         /// role to assign to the admin
-        #[structopt(short, long, possible_values = &comp::AdminRole::variants(), case_insensitive = true)]
+        #[structopt(possible_values = &comp::AdminRole::variants(), case_insensitive = true)]
         role: comp::AdminRole,
     },
     Remove {
-        #[structopt(short, long)]
         /// Name of the admin from whom to remove any existing roles
         username: String,
     },