Default to an unsafe water bucket for /sb with no arguments.

Don't keep adding buckets to the moderator's inventory. Instead require an empty hotbar slot, or an empty bucket, water bucket or lava bucket in the hotbar.
NerdNu · Feb 7, 2017 · f6b5485 · f6b5485
1 parent f2f9f9a
commit f6b5485
Showing 1 changed file with 18 additions and 18 deletions.
diff --git a/src/nu/nerd/SafeBuckets/SafeBuckets.java b/src/nu/nerd/SafeBuckets/SafeBuckets.java
@@ -95,7 +95,7 @@ private boolean sbCommand(CommandSender sender, String args[]) {
 
         if (0 <= args.length && args.length <= 2) {
             if (!(sender instanceof Player)) {
-                sender.sendMessage("[SafeBuckets] Console can't hold a water bucket!");
+                sender.sendMessage("[SafeBuckets] Console can't hold a bucket!");
                 return true;
             }
             if (!sender.hasPermission("safebuckets.tools.unsafe")) {
@@ -104,12 +104,22 @@ private boolean sbCommand(CommandSender sender, String args[]) {
             }
 
             Player player = (Player) sender;
-            ItemStack itemInHand = player.getItemInHand();
+            ItemStack itemInHand = player.getEquipment().getItemInMainHand();
 
-            boolean safe = true;
+            boolean safe = false;
             Material liquidContainer = Material.WATER_BUCKET;
 
-            if (itemInHand.getType().equals(Material.WATER_BUCKET) || itemInHand.getType().equals(Material.LAVA_BUCKET)) {
+            if (itemInHand != null &&
+                itemInHand.getType() != Material.AIR &&
+                itemInHand.getType() != Material.BUCKET &&
+                itemInHand.getType() != Material.WATER_BUCKET &&
+                itemInHand.getType() != Material.LAVA_BUCKET) {
+                sender.sendMessage(ChatColor.RED +
+                                   "[SafeBuckets] Your main hand must be empty, or holding an empty bucket, water bucket or lava bucket.");
+                return true;
+            }
+
+            if (itemInHand.getType() == Material.WATER_BUCKET || itemInHand.getType() == Material.LAVA_BUCKET) {
                 safe = isUnsafeBucket(itemInHand);
                 liquidContainer = itemInHand.getType();
             }
@@ -120,7 +130,7 @@ private boolean sbCommand(CommandSender sender, String args[]) {
                 } else if (args[0].equalsIgnoreCase("unsafe")) {
                     safe = false;
                 } else {
-                    sender.sendMessage("[SafeBuckets] Valid conditions are safe and unsafe");
+                    sender.sendMessage(ChatColor.RED + "[SafeBuckets] Valid conditions are safe and unsafe");
                     return true;
                 }
 
@@ -130,27 +140,17 @@ private boolean sbCommand(CommandSender sender, String args[]) {
                     else if (args[1].equalsIgnoreCase("lava"))
                         liquidContainer = Material.LAVA_BUCKET;
                     else {
-                        sender.sendMessage("[SafeBuckets] Valid liquids are water and lava");
+                        sender.sendMessage(ChatColor.RED + "[SafeBuckets] Valid liquids are water and lava");
                         return true;
                     }
                 }
             }
 
-            ItemStack newItem;
-            if (safe) {
-                newItem = getSafeBucket(liquidContainer);
-            } else {
-                newItem = getUnSafeBucket(liquidContainer);
-            }
-            if (itemInHand.getType().equals(liquidContainer) || itemInHand.getType().equals(Material.AIR)) {
-                player.getInventory().setItemInHand(newItem);
-            } else {
-                player.getInventory().addItem(newItem);
-            }
+            ItemStack newItem = safe ? getSafeBucket(liquidContainer) : getUnSafeBucket(liquidContainer);
+            player.getInventory().setItemInMainHand(newItem);
         }
 
         return true;
-
     }
 
     private boolean playerFlowCommand(CommandSender sender) {