浏览代码

Merge pull request #4236 from kn-km/patch-2

Fix McMMOPlayerRepairCheckEvent Handling
Robert Alan Chapton 5 年之前
父节点
当前提交
0dba450b5a
共有 1 个文件被更改,包括 4 次插入2 次删除
  1. 4 2
      src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java

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

@@ -128,6 +128,9 @@ public class RepairManager extends SkillManager {
         int baseRepairAmount = repairable.getBaseRepairDurability(item); // Did they send me daughters?
         int baseRepairAmount = repairable.getBaseRepairDurability(item); // Did they send me daughters?
         short newDurability = repairCalculate(startDurability, baseRepairAmount); // When I asked for sons?
         short newDurability = repairCalculate(startDurability, baseRepairAmount); // When I asked for sons?
 
 
+        // toRemove should be refreshed before the event call.
+        toRemove = inventory.getItem(inventory.first(repairMaterial)).clone();
+        
         // Call event
         // Call event
         if (EventUtils.callRepairCheckEvent(player, (short) (startDurability - newDurability), toRemove, item).isCancelled()) {
         if (EventUtils.callRepairCheckEvent(player, (short) (startDurability - newDurability), toRemove, item).isCancelled()) {
             return;
             return;
@@ -139,7 +142,6 @@ public class RepairManager extends SkillManager {
         }
         }
 
 
         // Remove the item
         // Remove the item
-        toRemove = inventory.getItem(inventory.first(repairMaterial)).clone();
         toRemove.setAmount(1);
         toRemove.setAmount(1);
 
 
         inventory.removeItem(toRemove);
         inventory.removeItem(toRemove);
@@ -393,4 +395,4 @@ public class RepairManager extends SkillManager {
     public void actualizeLastAnvilUse() {
     public void actualizeLastAnvilUse() {
         lastClick = (int) (System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR);
         lastClick = (int) (System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR);
     }
     }
-}
+}