TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-08-05 12:02:53 +00:00
Code Issues Projects Releases Wiki Activity

[trunk] Unlimited: allow permissions with ids instead of names:

Browse source 
essentials.unlimited.item-1

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1121 e251c2fe-e539-e718-e476-b85c1f46cddb
This commit is contained in:
snowleo 2011-04-04 14:51:19 +00:00
parent 28da8fa91c
commit 6f84be54f0
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java
View file

@ -52,29 +52,28 @@ public class Commandunlimited extends EssentialsCommand
String itemname = stack.getType().toString().toLowerCase().replace("_", "-"); String itemname = stack.getType().toString().toLowerCase().replace("_", "-");
if (!user.isAuthorized("essentials.unlimited.item-add") && if (!user.isAuthorized("essentials.unlimited.item-add") &&
!user.isAuthorized("essentials.unlimited.item-"+itemname) !user.isAuthorized("essentials.unlimited.item-"+itemname) &&
&& !((stack.getType() == Material.WATER_BUCKET || stack.getType() == Material.LAVA_BUCKET) !user.isAuthorized("essentials.unlimited.item-"+stack.getTypeId()) &&
&& user.isAuthorized("essentials.unlimited.item-bucket"))) { !((stack.getType() == Material.WATER_BUCKET || stack.getType() == Material.LAVA_BUCKET) &&
user.isAuthorized("essentials.unlimited.item-bucket"))) {
user.sendMessage(ChatColor.RED + "No permission for unlimited item "+itemname+"."); user.sendMessage(ChatColor.RED + "No permission for unlimited item "+itemname+".");
return; return;
} }
String itemName = stack.getType().name().toLowerCase().replace('_', ' ');
if (target.hasUnlimited(stack)) { if (target.hasUnlimited(stack)) {
if (user != target) { if (user != target) {
user.sendMessage("§7Disable unlimited placing of " + itemName + " for " + user.getDisplayName() + "."); user.sendMessage("§7Disable unlimited placing of " + itemname + " for " + user.getDisplayName() + ".");
} }
target.sendMessage("§7Disable unlimited placing of " + itemName + " for " + user.getDisplayName() + "."); target.sendMessage("§7Disable unlimited placing of " + itemname + " for " + user.getDisplayName() + ".");
target.setUnlimited(stack, false); target.setUnlimited(stack, false);
return; return;
} }
user.charge(this); user.charge(this);
if (user != target) { if (user != target) {
user.sendMessage("§7Giving unlimited amount of " + itemName + " to " + user.getDisplayName() + "."); user.sendMessage("§7Giving unlimited amount of " + itemname + " to " + user.getDisplayName() + ".");
} }
target.sendMessage("§7Giving unlimited amount of " + itemName + " to " + user.getDisplayName() + "."); target.sendMessage("§7Giving unlimited amount of " + itemname + " to " + user.getDisplayName() + ".");
if (!InventoryWorkaround.containsItem((CraftInventory)target.getInventory(), true, stack)) { if (!InventoryWorkaround.containsItem((CraftInventory)target.getInventory(), true, stack)) {
target.getInventory().addItem(stack); target.getInventory().addItem(stack);
} }