2.19.1 - fixed view cmd logic

Took 4 minutes
Tweetzy · Aug 19, 2024 · cfd7637 · cfd7637
1 parent 62ba848
commit cfd7637
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 18 deletions.
diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
 
     <name>Markets</name>
     <description>A new take on traditional player owned shops</description>
-    <version>2.19.0</version>
+    <version>2.19.1</version>
     <packaging>jar</packaging>
 
     <properties>

diff --git a/src/main/java/ca/tweetzy/markets/commands/CommandView.java b/src/main/java/ca/tweetzy/markets/commands/CommandView.java
@@ -52,34 +52,33 @@ protected ReturnType execute(CommandSender sender, String... args) {
 				return ReturnType.FAIL;
 			}
 
+			if (args.length == 1){
+				if (market.getOwnerUUID().equals(player.getUniqueId())) {
+					Markets.getGuiManager().showGUI(player, new MarketOverviewGUI(player, market));
+				} else {
+					Markets.getGuiManager().showGUI(player, new MarketViewGUI(player, market));
+				}
+				return ReturnType.SUCCESS;
+			}
+
 			if (args.length == 2) {
 				final Category locatedCategory = market.getCategories().stream().filter(category -> category.getName().equalsIgnoreCase(args[1])).findFirst().orElse(null);
 				if (locatedCategory == null) {
-					handle(market, player, target);
-				} else {
-					if (market.getOwnerUUID().equals(target.getUniqueId())) {
-						Markets.getGuiManager().showGUI(player, new MarketCategoryViewGUI(player, market, locatedCategory));
-					} else {
-						Markets.getGuiManager().showGUI(player, new MarketCategoryEditGUI(player, market, locatedCategory));
-					}
+					return ReturnType.FAIL;
 				}
 
-			} else {
-				handle(market, player, target);
+				if (market.getOwnerUUID().equals(player.getUniqueId())) {
+					Markets.getGuiManager().showGUI(player, new MarketCategoryEditGUI(player, market, locatedCategory));
+				} else {
+					Markets.getGuiManager().showGUI(player, new MarketCategoryViewGUI(player, market, locatedCategory));
+
+				}
 			}
 		}
 
 		return ReturnType.SUCCESS;
 	}
 
-	private void handle(Market market, Player player, OfflinePlayer target) {
-		if (market.getOwnerUUID().equals(target.getUniqueId())) {
-			Markets.getGuiManager().showGUI(player, new MarketOverviewGUI(player, market));
-		} else {
-			Markets.getGuiManager().showGUI(player, new MarketViewGUI(player, market));
-		}
-	}
-
 	@Override
 	protected List<String> tab(CommandSender sender, String... args) {
 		return null;