From 01edfed307c3220a17e029e841fedd009807472e Mon Sep 17 00:00:00 2001 From: StevenLawson Date: Sat, 26 Jul 2014 11:48:17 -0400 Subject: [PATCH] Tweak /whohas. Note the change from bitwise & to logical && resolving possible bug. --- .../Commands/Command_whohas.java | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_whohas.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_whohas.java index e518d554..1ade52ad 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_whohas.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_whohas.java @@ -17,22 +17,14 @@ public class Command_whohas extends TFM_Command @Override public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - boolean smite = false; - - if (args.length != 1) + if (args.length < 1) { - if (args.length == 2 && args[1].equals("smite")) - { - smite = true; - } - else - { - return false; - } + return false; } - final String materialName = args[0]; + final boolean doSmite = args.length >= 2 && "smite".equalsIgnoreCase(args[1]); + final String materialName = args[0]; Material material = Material.matchMaterial(materialName); if (material == null) { @@ -58,7 +50,7 @@ public class Command_whohas extends TFM_Command if (player.getInventory().contains(material)) { players.add(player.getName()); - if (smite & !TFM_AdminList.isSuperAdmin(player)) + if (doSmite && !TFM_AdminList.isSuperAdmin(player)) { Command_smite.smite(player); } @@ -75,6 +67,5 @@ public class Command_whohas extends TFM_Command } return true; - } }