From 66bf05621c47a49c45b8f79f07db3c3144a87d2f Mon Sep 17 00:00:00 2001 From: snowleo Date: Mon, 4 Apr 2011 13:06:01 +0000 Subject: [PATCH] [trunk] Unlimited: Display a message when user already has permissions to avoid confusion. git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1116 e251c2fe-e539-e718-e476-b85c1f46cddb --- .../essentials/commands/Commandunlimited.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java b/Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java index a8dcf8ad4..a3882d033 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java @@ -5,6 +5,7 @@ import com.earth2me.essentials.InventoryWorkaround; import com.earth2me.essentials.ItemDb; import com.earth2me.essentials.User; import org.bukkit.ChatColor; +import org.bukkit.Material; import org.bukkit.Server; import org.bukkit.craftbukkit.inventory.CraftInventory; import org.bukkit.inventory.ItemStack; @@ -38,6 +39,24 @@ public class Commandunlimited extends EssentialsCommand target = getPlayer(server, args, 1); } + if (target.isAuthorized("essentials.unlimited.eggthrow") && stack.getType() == Material.EGG) { + user.sendMessage(ChatColor.RED + "Unlimited eggs already activated by permissions."); + return; + } + + if (target.isAuthorized("essentials.unlimited.buckets") && + (stack.getType() == Material.WATER_BUCKET || stack.getType() == Material.LAVA_BUCKET)) { + user.sendMessage(ChatColor.RED + "Unlimited buckets already activated by permissions."); + return; + } + + if (target.isAuthorized("essentials.unlimited.placing") && + (stack.getType() != Material.WATER_BUCKET && stack.getType() != Material.LAVA_BUCKET && + stack.getType() != Material.EGG)) { + user.sendMessage(ChatColor.RED + "Unlimited placing already activated by permissions."); + return; + } + String itemName = stack.getType().name().toLowerCase().replace('_', ' '); if (target.hasUnlimited(stack)) {