Added ability to clear entire list of of unlimited items

Fixed permission bug with per item spawning
General unlimited cleanup
This commit is contained in:
okamosy 2011-08-11 20:47:51 +01:00
parent 65df249510
commit b776362be7

View File

@ -32,6 +32,31 @@ public class Commandunlimited extends EssentialsCommand
}
if (args[0].equalsIgnoreCase("list"))
{
String list = getList(target);
user.sendMessage(list);
}
else if (args[0].equalsIgnoreCase("clear"))
{
List<Integer> itemList = target.getUnlimited();
int index = 0;
while (itemList.size() > index)
{
Integer item = itemList.get(index);
if (toggleUnlimited(user, target, item.toString()) == false)
{
index++;
}
}
}
else
{
toggleUnlimited(user, target, args[0]);
}
}
private String getList(User target)
{
StringBuilder sb = new StringBuilder();
sb.append(Util.i18n("unlimitedItems")).append(" ");
@ -51,45 +76,47 @@ public class Commandunlimited extends EssentialsCommand
String matname = Material.getMaterial(integer).toString().toLowerCase().replace("_", "");
sb.append(matname);
}
user.sendMessage(sb.toString());
return;
return sb.toString();
}
final ItemStack stack = ess.getItemDb().get(args[0], 1);
private Boolean toggleUnlimited(User user, User target, String item) throws Exception
{
ItemStack stack = ess.getItemDb().get(item, 1);
stack.setAmount(Math.min(stack.getType().getMaxStackSize(), 2));
String itemname = stack.getType().toString().toLowerCase().replace("_", "");
if (!user.isAuthorized("essentials.unlimited.item-all")
if (ess.getSettings().permissionBasedItemSpawn()
&& (!user.isAuthorized("essentials.unlimited.item-all")
&& !user.isAuthorized("essentials.unlimited.item-" + itemname)
&& !user.isAuthorized("essentials.unlimited.item-" + stack.getTypeId())
&& !((stack.getType() == Material.WATER_BUCKET || stack.getType() == Material.LAVA_BUCKET)
&& user.isAuthorized("essentials.unlimited.item-bucket")))
&& user.isAuthorized("essentials.unlimited.item-bucket"))))
{
user.sendMessage(Util.format("unlimitedItemPermission", itemname));
return;
return false;
}
if (target.hasUnlimited(stack))
String message = "disableUnlimited";
Boolean enableUnlimited = false;
if (!target.hasUnlimited(stack))
{
if (user != target)
{
user.sendMessage(Util.format("disableUnlimited", itemname, target.getDisplayName()));
}
target.sendMessage(Util.format("disableUnlimited", itemname, target.getDisplayName()));
target.setUnlimited(stack, false);
return;
}
message = "enableUnlimited";
enableUnlimited = true;
charge(user);
if (user != target)
{
user.sendMessage(Util.format("enableUnlimited", itemname, target.getDisplayName()));
}
target.sendMessage(Util.format("enableUnlimited", itemname, target.getDisplayName()));
if (!InventoryWorkaround.containsItem(target.getInventory(), true, stack))
{
target.getInventory().addItem(stack);
}
target.setUnlimited(stack, true);
}
if (user != target)
{
user.sendMessage(Util.format(message, itemname, target.getDisplayName()));
}
target.sendMessage(Util.format(message, itemname, target.getDisplayName()));
target.setUnlimited(stack, enableUnlimited);
return true;
}
}