Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-11-06 11:00:43 +01:00
Code Issues Projects Releases Wiki Activity

Added ability to clear entire list of of unlimited items

Browse Source 
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
1 changed files with 65 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java
View File

@ -33,63 +33,90 @@ public class Commandunlimited extends EssentialsCommand
if (args[0].equalsIgnoreCase("list")) if (args[0].equalsIgnoreCase("list"))
{ {
StringBuilder sb = new StringBuilder(); String list = getList(target);
sb.append(Util.i18n("unlimitedItems")).append(" "); user.sendMessage(list);
boolean first = true; }
List<Integer> items = target.getUnlimited(); else if (args[0].equalsIgnoreCase("clear"))
if (items.isEmpty()) {
List<Integer> itemList = target.getUnlimited();
int index = 0;
while (itemList.size() > index)
{ {
sb.append(Util.i18n("none")); Integer item = itemList.get(index);
} if (toggleUnlimited(user, target, item.toString()) == false)
for (Integer integer : items)
{
if (!first)
{ {
sb.append(", "); index++;
} }
first = false;
String matname = Material.getMaterial(integer).toString().toLowerCase().replace("_", "");
sb.append(matname);
} }
user.sendMessage(sb.toString()); }
return; else
{
toggleUnlimited(user, target, args[0]);
}
}
private String getList(User target)
{
StringBuilder sb = new StringBuilder();
sb.append(Util.i18n("unlimitedItems")).append(" ");
boolean first = true;
List<Integer> items = target.getUnlimited();
if (items.isEmpty())
{
sb.append(Util.i18n("none"));
}
for (Integer integer : items)
{
if (!first)
{
sb.append(", ");
}
first = false;
String matname = Material.getMaterial(integer).toString().toLowerCase().replace("_", "");
sb.append(matname);
} }
final ItemStack stack = ess.getItemDb().get(args[0], 1); return sb.toString();
}
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)); stack.setAmount(Math.min(stack.getType().getMaxStackSize(), 2));
String itemname = stack.getType().toString().toLowerCase().replace("_", ""); String itemname = stack.getType().toString().toLowerCase().replace("_", "");
if (!user.isAuthorized("essentials.unlimited.item-all") if (ess.getSettings().permissionBasedItemSpawn()
&& !user.isAuthorized("essentials.unlimited.item-" + itemname) && (!user.isAuthorized("essentials.unlimited.item-all")
&& !user.isAuthorized("essentials.unlimited.item-" + stack.getTypeId()) && !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(Util.format("unlimitedItemPermission", itemname)); user.sendMessage(Util.format("unlimitedItemPermission", itemname));
return; return false;
} }
String message = "disableUnlimited";
if (target.hasUnlimited(stack)) Boolean enableUnlimited = false;
if (!target.hasUnlimited(stack))
{ {
if (user != target) message = "enableUnlimited";
enableUnlimited = true;
charge(user);
if (!InventoryWorkaround.containsItem(target.getInventory(), true, stack))
{ {
user.sendMessage(Util.format("disableUnlimited", itemname, target.getDisplayName())); target.getInventory().addItem(stack);
} }
target.sendMessage(Util.format("disableUnlimited", itemname, target.getDisplayName()));
target.setUnlimited(stack, false);
return;
} }
charge(user);
if (user != target) if (user != target)
{ {
user.sendMessage(Util.format("enableUnlimited", itemname, target.getDisplayName())); user.sendMessage(Util.format(message, itemname, target.getDisplayName()));
} }
target.sendMessage(Util.format("enableUnlimited", itemname, target.getDisplayName())); target.sendMessage(Util.format(message, itemname, target.getDisplayName()));
if (!InventoryWorkaround.containsItem(target.getInventory(), true, stack)) target.setUnlimited(stack, enableUnlimited);
{
target.getInventory().addItem(stack); return true;
}
target.setUnlimited(stack, true);
} }
} }