summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2011-08-20 21:58:55 +0100
committerKHobbits <rob@khobbits.co.uk>2011-08-20 21:58:55 +0100
commitaefc9b99427833cc8e4937d653ebec4f28754eb1 (patch)
tree63d96d13d00ed08192d589a62f2b0459a66186e4
parent73e7e2330ed53773ba16eaa99bbb95f90286480a (diff)
parent5e2eecd55089ec8bbb4eeda8354566d0fb665504 (diff)
downloadEssentials-aefc9b99427833cc8e4937d653ebec4f28754eb1.tar
Essentials-aefc9b99427833cc8e4937d653ebec4f28754eb1.tar.gz
Essentials-aefc9b99427833cc8e4937d653ebec4f28754eb1.tar.lz
Essentials-aefc9b99427833cc8e4937d653ebec4f28754eb1.tar.xz
Essentials-aefc9b99427833cc8e4937d653ebec4f28754eb1.zip
Merge branch 'master' of github.com:khobbits/Essentials
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandrepair.java18
1 files changed, 10 insertions, 8 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java b/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java
index a388f92d2..e98deeab7 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java
@@ -45,22 +45,23 @@ public class Commandrepair extends EssentialsCommand
}
String itemName = item.getType().toString().toLowerCase().replace('_', ' ');
+ charge(user);
user.sendMessage(Util.format("repair", itemName));
}
else if (args[0].equalsIgnoreCase("all"))
{
StringBuilder itemList = new StringBuilder();
itemList.append(repairItems(user.getInventory().getContents()));
-
+
String armor = repairItems(user.getInventory().getArmorContents());
-
- if(armor.length() > 0)
+
+ if (armor.length() > 0)
{
- if(itemList.length() > 0)
+ if (itemList.length() > 0)
{
itemList.append(", ");
}
-
+
itemList.append(armor);
}
@@ -70,6 +71,7 @@ public class Commandrepair extends EssentialsCommand
}
else
{
+ charge(user);
user.sendMessage(Util.format("repair", itemList.toString()));
}
@@ -88,15 +90,15 @@ public class Commandrepair extends EssentialsCommand
{
throw new Exception(Util.i18n("repairInvalidType"));
}
-
+
if (item.getDurability() == 0)
{
throw new Exception(Util.i18n("repairAlreadyFixed"));
}
-
+
item.setDurability((short)0);
}
-
+
private String repairItems(ItemStack[] items)
{
StringBuilder itemList = new StringBuilder();