diff --git a/src/main/java/com/volmit/iris/command/CommandIrisCTC.java b/src/main/java/com/volmit/iris/command/CommandIrisCTC.java index 31ee1b6a4..baab7ae7e 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisCTC.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisCTC.java @@ -13,7 +13,7 @@ public class CommandIrisCTC extends MortarCommand { public CommandIrisCTC() { - super("ctc"); + super("ctc", "threads", "thread"); setDescription("Change generator thread count"); requiresPermission(Iris.perm.studio); setCategory("World"); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisWhatBiome.java b/src/main/java/com/volmit/iris/command/CommandIrisWhatBiome.java index 57b28b6ce..63e3c8e4f 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisWhatBiome.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisWhatBiome.java @@ -14,11 +14,11 @@ public class CommandIrisWhatBiome extends MortarCommand { public CommandIrisWhatBiome() { - super("biome", "bi"); + super("biome", "bi", "b"); setDescription("Get the biome data you are in."); requiresPermission(Iris.perm.studio); setCategory("Wut"); - setDescription("What biome am i In"); + setDescription("What biome am I in"); } @Override diff --git a/src/main/java/com/volmit/iris/command/CommandIrisWhatBlock.java b/src/main/java/com/volmit/iris/command/CommandIrisWhatBlock.java index 3c34cec02..7eb6b587b 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisWhatBlock.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisWhatBlock.java @@ -15,11 +15,11 @@ public class CommandIrisWhatBlock extends MortarCommand { public CommandIrisWhatBlock() { - super("block", "b"); + super("block", "l", "bl"); setDescription("Get the block data for looking."); requiresPermission(Iris.perm.studio); setCategory("Wut"); - setDescription("WAILA,WAWLA etc"); + setDescription("WAILA, WAWLA etc"); } @Override @@ -27,8 +27,18 @@ public class CommandIrisWhatBlock extends MortarCommand { if(sender.isPlayer()) { + BlockData bd; Player p = sender.player(); - BlockData bd = p.getTargetBlockExact(128, FluidCollisionMode.NEVER).getBlockData(); + try + { + bd = p.getTargetBlockExact(128, FluidCollisionMode.NEVER).getBlockData(); + } + catch (NullPointerException e) + { + sender.sendMessage("Please look at any block, not at the sky"); + bd = null; + } + if(bd != null) { sender.sendMessage("Material: " + C.GREEN + bd.getMaterial().name()); @@ -68,6 +78,8 @@ public class CommandIrisWhatBlock extends MortarCommand { sender.sendMessage(C.YELLOW + "* Solid Block"); } + } else { + sender.sendMessage("Please look at any block, not at the sky"); } } diff --git a/src/main/java/com/volmit/iris/command/CommandIrisWhatHand.java b/src/main/java/com/volmit/iris/command/CommandIrisWhatHand.java index 67a904711..1c8c26495 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisWhatHand.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisWhatHand.java @@ -17,7 +17,7 @@ public class CommandIrisWhatHand extends MortarCommand setDescription("Get the block data for holding."); requiresPermission(Iris.perm.studio); setCategory("Wut"); - setDescription("What block holding"); + setDescription("What block am I holding"); } @Override @@ -30,6 +30,8 @@ public class CommandIrisWhatHand extends MortarCommand if(!bd.getMaterial().equals(Material.AIR)) { sender.sendMessage("Material: " + C.GREEN + bd.getMaterial().name()); sender.sendMessage("Full: " + C.WHITE + bd.getAsString(true)); + } else { + sender.sendMessage("Please hold a block"); } }