From e741dd6f657576f26fe71b39c46485bb2895fa8c Mon Sep 17 00:00:00 2001
From: BuildTools <unconfigured@null.spigotmc.org>
Date: Thu, 22 Oct 2020 23:56:45 +0200
Subject: [PATCH] Update CommandIrisStructureCreate.java

Prevent omitting parameters
---
 .../command/CommandIrisStructureCreate.java   | 60 +++++++++++++++----
 1 file changed, 47 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStructureCreate.java b/src/main/java/com/volmit/iris/command/CommandIrisStructureCreate.java
index 181edf2a2..30d1636b9 100644
--- a/src/main/java/com/volmit/iris/command/CommandIrisStructureCreate.java
+++ b/src/main/java/com/volmit/iris/command/CommandIrisStructureCreate.java
@@ -19,34 +19,68 @@ public class CommandIrisStructureCreate extends MortarCommand
 	}
 
 	@Override
-	public boolean handle(MortarSender sender, String[] args)
-	{
-		if(!IrisSettings.get().isStudio())
-		{
+	public boolean handle(MortarSender sender, String[] args) {
+		if (!IrisSettings.get().isStudio()) {
 			sender.sendMessage("To use Iris Studio Structures, please enable studio in Iris/settings.json");
 			return true;
 		}
-		
-		if(!sender.isPlayer())
-		{
-			sender.sendMessage("You don't have a wand");
+
+		if (!sender.isPlayer()) {
+			sender.sendMessage("You cannot run this from console");
 			return true;
 		}
 
 		Player p = sender.player();
 
 		boolean d3 = false;
+		int width;
+		int height;
 
-		for(String i : args)
-		{
-			if(i.equalsIgnoreCase("-3d"))
-			{
+
+		switch (args.length) {
+			case 0: {
+				sender.sendMessage("Please specify the name of the object you wish to create");
+				return true;
+			}
+			case 1: {
+				sender.sendMessage("Please specify the name of the dimension you are in");
+				return true;
+			}
+			case 2: {
+				sender.sendMessage("No width and height specified. Taking defaults (5 and 5)");
+				return true;
+			}
+			case 3: {
+				sender.sendMessage("No height specified, taking width as height");
+				width = Integer.parseInt(args[2]);
+				height = Integer.parseInt(args[2]);
+			}
+			case 4: {
+				if (!args[3].equalsIgnoreCase("-3d")) {
+					sender.sendMessage("No height specified, taking width as height");
+					width = Integer.parseInt(args[2]);
+					height = Integer.parseInt(args[2]);
+					return true;
+				} else {
+					width = Integer.parseInt(args[2]);
+					height = Integer.parseInt(args[3]);
+					break;
+				}
+			}
+			case 5: {
+				width = Integer.parseInt(args[2]);
+				height = Integer.parseInt(args[3]);
 				d3 = true;
 			}
+			default: {
+				width = Integer.parseInt(args[2]);
+				height = Integer.parseInt(args[3]);
+				break;
+			}
 		}
 
 		sender.sendMessage("Creating new Structure");
-		new StructureTemplate(args[0], args[1], p, p.getLocation(), 5, Integer.valueOf(args[2]), Integer.valueOf(args[3]), d3);
+		new StructureTemplate(args[0], args[1], p, p.getLocation(), 5, width, height, d3);
 
 		return true;
 	}