minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-10 08:34:17 +02:00
Code Issues Releases Wiki Activity

Add some debugging to make it easier to diagnose kit errors.

Browse Source
This commit is contained in:
KHobbits
2014-06-25 19:19:04 +01:00
parent f6b2524a8c
commit 87c0f20e92
1 changed files with 36 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
Essentials/src/com/earth2me/essentials/commands/Commandkit.java
View File

@@ -8,6 +8,7 @@ import com.earth2me.essentials.utils.StringUtil;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.logging.Level;
import org.bukkit.Server; import org.bukkit.Server;
@@ -17,7 +18,7 @@ public class Commandkit extends EssentialsCommand
{ {
super("kit"); super("kit");
} }
@Override @Override
public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
{ {
@@ -39,7 +40,7 @@ public class Commandkit extends EssentialsCommand
giveKits(user, user, kitNames); giveKits(user, user, kitNames);
} }
} }
@Override @Override
public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
{ {
@@ -53,18 +54,18 @@ public class Commandkit extends EssentialsCommand
{ {
final User userTo = getPlayer(server, args, 1, true, false); final User userTo = getPlayer(server, args, 1, true, false);
final String[] kits = args[0].toLowerCase(Locale.ENGLISH).split(","); final String[] kits = args[0].toLowerCase(Locale.ENGLISH).split(",");
for (final String kitName : kits) for (final String kitName : kits)
{ {
final Kit kit = new Kit(kitName, ess); final Kit kit = new Kit(kitName, ess);
kit.expandItems(userTo); kit.expandItems(userTo);
sender.sendMessage(tl("kitGiveTo", kitName, userTo.getDisplayName())); sender.sendMessage(tl("kitGiveTo", kitName, userTo.getDisplayName()));
userTo.sendMessage(tl("kitReceive", kitName)); userTo.sendMessage(tl("kitReceive", kitName));
} }
} }
} }
private void giveKits(final User userTo, final User userFrom, final String kitNames) throws Exception private void giveKits(final User userTo, final User userFrom, final String kitNames) throws Exception
{ {
if (kitNames.isEmpty()) if (kitNames.isEmpty())
@@ -72,35 +73,53 @@ public class Commandkit extends EssentialsCommand
throw new Exception(tl("kitNotFound")); throw new Exception(tl("kitNotFound"));
} }
String[] kitList = kitNames.split(","); String[] kitList = kitNames.split(",");
List<Kit> kits = new ArrayList<Kit>(); List<Kit> kits = new ArrayList<Kit>();
for (final String kitName : kitList) for (final String kitName : kitList)
{ {
if (kitName.isEmpty()) if (kitName.isEmpty())
{ {
throw new Exception(tl("kitNotFound")); throw new Exception(tl("kitNotFound"));
} }
Kit kit = new Kit(kitName, ess); Kit kit = new Kit(kitName, ess);
kit.checkPerms(userFrom); kit.checkPerms(userFrom);
kit.checkDelay(userFrom); kit.checkDelay(userFrom);
kit.checkAffordable(userFrom); kit.checkAffordable(userFrom);
kits.add(kit); kits.add(kit);
} }
for (final Kit kit : kits) for (final Kit kit : kits)
{ {
kit.setTime(userFrom); try
kit.expandItems(userTo);
kit.chargeUser(userTo);
if (!userFrom.equals(userTo))
{ {
userFrom.sendMessage(tl("kitGiveTo", kit.getName(), userTo.getDisplayName()));
kit.checkDelay(userFrom);
kit.checkAffordable(userFrom);
kit.setTime(userFrom);
kit.expandItems(userTo);
kit.chargeUser(userTo);
if (!userFrom.equals(userTo))
{
userFrom.sendMessage(tl("kitGiveTo", kit.getName(), userTo.getDisplayName()));
}
userTo.sendMessage(tl("kitReceive", kit.getName()));
}
catch (NoChargeException ex)
{
if (ess.getSettings().isDebug())
{
ess.getLogger().log(Level.INFO, "Soft kit error, abort spawning " + kit.getName(), ex);
}
}
catch (Exception ex)
{
ess.showError(userFrom.getSource(), ex, "\\ kit: " + kit.getName());
} }
userTo.sendMessage(tl("kitReceive", kit.getName()));
} }
} }
} }