Browse Source

Check durability before repairMaterial

roblikescake 11 years ago
parent
commit
09431ef27c
1 changed files with 8 additions and 8 deletions
  1. 8 8
      src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java

+ 8 - 8
src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java

@@ -90,7 +90,15 @@ public class RepairManager extends SkillManager {
         Material repairMaterial = repairable.getRepairMaterial();
         byte repairMaterialMetadata = repairable.getRepairMaterialMetadata();
         ItemStack toRemove = new MaterialData(repairMaterial, repairMaterialMetadata).toItemStack(1);
+        
+        short startDurability = item.getDurability();
 
+        // Do not repair if at full durability
+        if (startDurability <= 0) {
+            player.sendMessage(LocaleLoader.getString("Repair.Skills.FullDurability"));
+            return;
+        }
+        
         // Check if they have the proper material to repair with
         if (!inventory.contains(repairMaterial)) {
             String message = LocaleLoader.getString("Skills.NeedMore", StringUtils.getPrettyItemString(repairMaterial));
@@ -103,14 +111,6 @@ public class RepairManager extends SkillManager {
             return;
         }
 
-        short startDurability = item.getDurability();
-
-        // Do not repair if at full durability
-        if (startDurability <= 0) {
-            player.sendMessage(LocaleLoader.getString("Repair.Skills.FullDurability"));
-            return;
-        }
-
         // Do not repair stacked items
         if (item.getAmount() != 1) {
             player.sendMessage(LocaleLoader.getString("Repair.Skills.StackedItems"));