TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-04-26 16:39:45 +00:00
Code Issues Projects Releases Wiki Activity

[trunk] fix /sell inventory / blocks chat spam

Browse source 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1363 e251c2fe-e539-e718-e476-b85c1f46cddb
This commit is contained in:
ementalo 2011-05-07 12:11:56 +00:00
parent cf1b72a740
commit bd5b8eacd0
1 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
Essentials/src/com/earth2me/essentials/commands/Commandsell.java
View file

@ -34,7 +34,7 @@ public class Commandsell extends EssentialsCommand
for (ItemStack stack : user.getInventory().getContents())
{
if (stack == null || stack.getType() == Material.AIR) continue;
sellItem(user, stack, args);
sellItem(user, stack, args, true);
}
return;
}
@ -43,7 +43,7 @@ public class Commandsell extends EssentialsCommand
for (ItemStack stack : user.getInventory().getContents())
{
if (stack == null || stack.getTypeId() > 255 || stack.getType() == Material.AIR) continue;
sellItem(user, stack, args);
sellItem(user, stack, args, true);
}
return;
}
@ -51,10 +51,10 @@ public class Commandsell extends EssentialsCommand
{
is = ItemDb.get(args[0]);
}
sellItem(user, is, args);
sellItem(user, is, args, false);
}
private void sellItem(User user, ItemStack is, String[] args) throws Exception
private void sellItem(User user, ItemStack is, String[] args, boolean isBulkSell) throws Exception
{
if (is == null || is.getType() == Material.AIR)
{
@ -83,22 +83,30 @@ public class Commandsell extends EssentialsCommand
throw new Exception("Item must be traded in stacks. A quantity of 2s would be two stacks, etc.");
}
int max = 0;
for (ItemStack s : user.getInventory().getContents())
if (!isBulkSell)
{
if (s == null)
for (ItemStack s : user.getInventory().getContents())
{
continue;
if (s == null)
{
continue;
}
if (s.getTypeId() != is.getTypeId())
{
continue;
}
if (s.getDurability() != is.getDurability())
{
continue;
}
max += s.getAmount();
}
if (s.getTypeId() != is.getTypeId())
{
continue;
}
if (s.getDurability() != is.getDurability())
{
continue;
}
max += s.getAmount();
}
else
{
max += is.getAmount();
}
if (stack)