From 92e7ac7f2065bc67d690012ee5c23282aed537b5 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Sat, 1 Aug 2020 11:11:53 -0400 Subject: [PATCH] Fix cmds --- .../com/volmit/iris/command/CommandIrisGoto.java | 12 ++++++------ .../iris/command/CommandIrisObjectContract.java | 2 +- .../iris/command/CommandIrisObjectExpand.java | 2 +- .../iris/command/CommandIrisObjectPaste.java | 14 +++++++------- .../iris/command/CommandIrisObjectShift.java | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/volmit/iris/command/CommandIrisGoto.java b/src/main/java/com/volmit/iris/command/CommandIrisGoto.java index fe5d3a6ca..8e545990c 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisGoto.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisGoto.java @@ -45,20 +45,20 @@ public class CommandIrisGoto extends MortarCommand int tries = 10000; boolean cave = false; IrisBiome biome2 = null; - if(args.length > 2) + if(args.length > 1) { - if(args[2].equalsIgnoreCase("-cave")) + if(args[1].equalsIgnoreCase("-cave")) { cave = true; } else { - biome2 = Iris.data.getBiomeLoader().load(args[2]); + biome2 = Iris.data.getBiomeLoader().load(args[1]); if(biome2 == null) { - sender.sendMessage(args[2] + " is not a biome. Use the file name (without extension)"); + sender.sendMessage(args[1] + " is not a biome. Use the file name (without extension)"); return true; } } @@ -72,11 +72,11 @@ public class CommandIrisGoto extends MortarCommand } } - IrisBiome biome = Iris.data.getBiomeLoader().load(args[1]); + IrisBiome biome = Iris.data.getBiomeLoader().load(args[0]); if(biome == null) { - sender.sendMessage(args[1] + " is not a biome. Use the file name (without extension)"); + sender.sendMessage(args[0] + " is not a biome. Use the file name (without extension)"); return true; } diff --git a/src/main/java/com/volmit/iris/command/CommandIrisObjectContract.java b/src/main/java/com/volmit/iris/command/CommandIrisObjectContract.java index 68337eb77..cd7ce449a 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisObjectContract.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisObjectContract.java @@ -38,7 +38,7 @@ public class CommandIrisObjectContract extends MortarCommand return true; } - int amt = Integer.valueOf(args[2]); + int amt = Integer.valueOf(args[0]); Location[] b = WandController.getCuboid(p.getInventory().getItemInMainHand()); Location a1 = b[0].clone(); Location a2 = b[1].clone(); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisObjectExpand.java b/src/main/java/com/volmit/iris/command/CommandIrisObjectExpand.java index a705caffc..27c3286c8 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisObjectExpand.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisObjectExpand.java @@ -38,7 +38,7 @@ public class CommandIrisObjectExpand extends MortarCommand return true; } - int amt = Integer.valueOf(args[2]); + int amt = Integer.valueOf(args[0]); Location[] b = WandController.getCuboid(p.getInventory().getItemInMainHand()); Location a1 = b[0].clone(); Location a2 = b[1].clone(); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisObjectPaste.java b/src/main/java/com/volmit/iris/command/CommandIrisObjectPaste.java index 137908d40..b68b7773f 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisObjectPaste.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisObjectPaste.java @@ -36,7 +36,7 @@ public class CommandIrisObjectPaste extends MortarCommand } Player p = sender.player(); - File file = new File(Iris.instance.getDataFolder(), "objects/" + args[1] + ".iob"); + File file = new File(Iris.instance.getDataFolder(), "objects/" + args[0] + ".iob"); boolean intoWand = false; for(String i : args) @@ -49,7 +49,7 @@ public class CommandIrisObjectPaste extends MortarCommand if(!file.exists()) { - sender.sendMessage("Can't find " + "objects/" + args[1] + ".iob"); + sender.sendMessage("Can't find " + "objects/" + args[0] + ".iob"); } ItemStack wand = ((Player) sender).getInventory().getItemInMainHand(); @@ -57,8 +57,8 @@ public class CommandIrisObjectPaste extends MortarCommand try { - o.read(new File(Iris.instance.getDataFolder(), "objects/" + args[1] + ".iob")); - sender.sendMessage("Loaded " + "objects/" + args[1] + ".iob"); + o.read(new File(Iris.instance.getDataFolder(), "objects/" + args[0] + ".iob")); + sender.sendMessage("Loaded " + "objects/" + args[0] + ".iob"); ((Player) sender).getWorld().playSound(((Player) sender).getLocation(), Sound.BLOCK_ENCHANTMENT_TABLE_USE, 1f, 1.5f); Location block = ((Player) sender).getTargetBlock((Set) null, 256).getLocation().clone().add(0, 1, 0); @@ -67,16 +67,16 @@ public class CommandIrisObjectPaste extends MortarCommand { wand = WandController.createWand(block.clone().subtract(o.getCenter()).add(o.getW() - 1, o.getH(), o.getD() - 1), block.clone().subtract(o.getCenter())); p.getInventory().setItemInMainHand(wand); - sender.sendMessage("Updated wand for " + "objects/" + args[1] + ".iob"); + sender.sendMessage("Updated wand for " + "objects/" + args[0] + ".iob"); } WandController.pasteSchematic(o, block); - sender.sendMessage("Placed " + "objects/" + args[1] + ".iob"); + sender.sendMessage("Placed " + "objects/" + args[0] + ".iob"); } catch(IOException e) { - sender.sendMessage("Failed to load " + "objects/" + args[1] + ".iob"); + sender.sendMessage("Failed to load " + "objects/" + args[0] + ".iob"); e.printStackTrace(); } diff --git a/src/main/java/com/volmit/iris/command/CommandIrisObjectShift.java b/src/main/java/com/volmit/iris/command/CommandIrisObjectShift.java index 9840bd1e3..8ceb703c4 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisObjectShift.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisObjectShift.java @@ -38,7 +38,7 @@ public class CommandIrisObjectShift extends MortarCommand return true; } - int amt = Integer.valueOf(args[2]); + int amt = Integer.valueOf(args[0]); Location[] b = WandController.getCuboid(p.getInventory().getItemInMainHand()); Location a1 = b[0].clone(); Location a2 = b[1].clone();