minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-30 09:49:51 +02:00
Code Issues Releases Wiki Activity

Correctly implement charges in /more all

Browse Source
This commit is contained in:
snowleo
2012-10-15 23:28:53 +02:00
parent c74545d614
commit d82899ebd6
1 changed files with 48 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
Essentials/src/net/ess3/commands/Commandmore.java
View File

@@ -2,8 +2,10 @@ package net.ess3.commands;
import java.util.Locale; import java.util.Locale;
import static net.ess3.I18n._; import static net.ess3.I18n._;
import net.ess3.api.ChargeException;
import net.ess3.api.ISettings; import net.ess3.api.ISettings;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import net.ess3.economy.Trade;
import net.ess3.permissions.Permissions; import net.ess3.permissions.Permissions;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
@@ -29,37 +31,69 @@ public class Commandmore extends EssentialsCommand
{ {
if (stack == null) if (stack == null)
{ {
throw new Exception(_("cantSpawnItem", "Air")); if (stacks.length == 1)
{
throw new Exception(_("cantSpawnItem", "Air"));
}
else
{
continue;
}
} }
ISettings settings = ess.getSettings(); ISettings settings = ess.getSettings();
int defaultStackSize = settings.getData().getGeneral().getDefaultStacksize(); int defaultStackSize = settings.getData().getGeneral().getDefaultStacksize();
int oversizedStackSize = settings.getData().getGeneral().getOversizedStacksize(); int oversizedStackSize = settings.getData().getGeneral().getOversizedStacksize();
if (stack.getAmount() >= (Permissions.OVERSIZEDSTACKS.isAuthorized(user) int newAmount = Permissions.OVERSIZEDSTACKS.isAuthorized(user)
? oversizedStackSize ? oversizedStackSize
: defaultStackSize > 0 ? defaultStackSize : stack.getMaxStackSize())) : defaultStackSize > 0 ? defaultStackSize : stack.getMaxStackSize();
if (stack.getAmount() >= newAmount)
{ {
throw new NoChargeException(); if (stacks.length == 1)
{
throw new NoChargeException();
}
else
{
continue;
}
} }
final String itemname = stack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""); final String itemname = stack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", "");
if (!Permissions.ITEMSPAWN.isAuthorized(user, stack)) if (!Permissions.ITEMSPAWN.isAuthorized(user, stack))
{ {
throw new Exception(_("cantSpawnItem", itemname)); if (stacks.length == 1)
{
throw new Exception(_("cantSpawnItem", itemname));
}
else
{
continue;
}
} }
if (Permissions.OVERSIZEDSTACKS.isAuthorized(user)) if (stack.getAmount() < newAmount && stacks.length > 1)
{ {
stack.setAmount(oversizedStackSize); Trade trade = new Trade("more", ess);
} try
else {
{ trade.charge(user);
stack.setAmount(defaultStackSize > 0 ? defaultStackSize : stack.getMaxStackSize()); }
catch (ChargeException ex)
{
user.sendMessage(ex.getMessage());
break;
}
} }
stack.setAmount(newAmount);
} }
if (stacks.length > 1) if (stacks.length > 1)
{ {
user.getPlayer().getInventory().setContents(stacks); user.getPlayer().getInventory().setContents(stacks);
} }
user.getPlayer().updateInventory(); user.getPlayer().updateInventory();
if (stacks.length > 1)
{
throw new NoChargeException();
}
} }
} }