From 4be32d384963b4b46b743b55c4ff6715f05e7a08 Mon Sep 17 00:00:00 2001
From: Fisher2911 <fisher1205l@gmail.com>
Date: Wed, 6 Apr 2022 23:35:19 -0400
Subject: [PATCH] Allow console command for wardrobe

---
 .../command/CosmeticsCommand.java             | 32 +++++++++++++++----
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/common/src/main/java/io/github/fisher2911/hmccosmetics/command/CosmeticsCommand.java b/common/src/main/java/io/github/fisher2911/hmccosmetics/command/CosmeticsCommand.java
index 3f0cfaf9..4145950e 100644
--- a/common/src/main/java/io/github/fisher2911/hmccosmetics/command/CosmeticsCommand.java
+++ b/common/src/main/java/io/github/fisher2911/hmccosmetics/command/CosmeticsCommand.java
@@ -63,7 +63,9 @@ public class CosmeticsCommand extends CommandBase {
 
     @SubCommand("menu")
     @Permission(io.github.fisher2911.hmccosmetics.message.Permission.DEFAULT_COMMAND)
-    public void defaultCommand(final Player player, @Completion("#menus") @me.mattstudios.mf.annotations.Optional String menu) {
+    public void defaultCommand(
+            final Player player,
+            @Completion("#menus") @me.mattstudios.mf.annotations.Optional String menu) {
         final Optional<User> optionalUser = this.userManager.get(player.getUniqueId());
         if (menu == null) menu = this.cosmeticSettings.getDefaultMenu();
         if (optionalUser.isEmpty()) {
@@ -201,8 +203,11 @@ public class CosmeticsCommand extends CommandBase {
 
     @SubCommand("remove")
     @Permission(io.github.fisher2911.hmccosmetics.message.Permission.SET_COSMETIC_COMMAND)
-    public void removeCommand(final CommandSender sender,
-                              @Completion("#players") final Player player, @Completion("#types") String typeString) {
+    public void removeCommand(
+            final CommandSender sender,
+            @Completion("#players") final Player player,
+            @Completion("#types") String typeString
+    ) {
         final Optional<User> userOptional = this.userManager.get(player.getUniqueId());
 
         if (userOptional.isEmpty()) {
@@ -233,22 +238,35 @@ public class CosmeticsCommand extends CommandBase {
 
     @SubCommand("wardrobe")
     @Permission(io.github.fisher2911.hmccosmetics.message.Permission.WARDROBE)
-    public void openWardrobe(Player player, @me.mattstudios.mf.annotations.Optional final Player other) {
+    public void openWardrobe(
+            CommandSender sender,
+            @me.mattstudios.mf.annotations.Optional final Player other
+    ) {
+        Player player = null;
         if (other != null) {
-            if (!player.hasPermission(io.github.fisher2911.hmccosmetics.message.Permission.OPEN_OTHER_WARDROBE)) {
+            if (!sender.hasPermission(io.github.fisher2911.hmccosmetics.message.Permission.OPEN_OTHER_WARDROBE)) {
                 this.messageHandler.sendMessage(
-                        player,
+                        sender,
                         Messages.NO_PERMISSION
                 );
                 return;
             }
             this.messageHandler.sendMessage(
-                    player,
+                    sender,
                     Messages.OPENED_OTHER_WARDROBE,
                     Map.of(Placeholder.PLAYER, other.getName())
             );
             player = other;
+        } else if (!(sender instanceof final Player p)) {
+            this.messageHandler.sendMessage(
+                    sender,
+                    Messages.MUST_BE_PLAYER
+            );
+            return;
+        } else {
+            player = p;
         }
+
         final Optional<User> optionalUser = this.plugin.getUserManager().get(player.getUniqueId());
         if (optionalUser.isEmpty()) return;