From ed9521d4a048dfb7b7dc169802cfbc0b9d8247be Mon Sep 17 00:00:00 2001
From: kn-km <974787396@qq.com>
Date: Mon, 27 Jul 2020 23:18:55 +0800
Subject: [PATCH] Fix #4234

---
 .../java/com/gmail/nossr50/skills/repair/RepairManager.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java b/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java
index ab4a98fbe..910c3f5bf 100644
--- a/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java
+++ b/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?
         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
         if (EventUtils.callRepairCheckEvent(player, (short) (startDurability - newDurability), toRemove, item).isCancelled()) {
             return;
@@ -139,7 +142,6 @@ public class RepairManager extends SkillManager {
         }
 
         // Remove the item
-        toRemove = inventory.getItem(inventory.first(repairMaterial)).clone();
         toRemove.setAmount(1);
 
         inventory.removeItem(toRemove);
@@ -393,4 +395,4 @@ public class RepairManager extends SkillManager {
     public void actualizeLastAnvilUse() {
         lastClick = (int) (System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR);
     }
-}
\ No newline at end of file
+}