EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-10-16 17:13:38 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Fix McMMOPlayerRepairCheckEvent Handling
This commit is contained in:
Robert Alan Chapton 2020-07-31 20:43:01 -07:00 committed by GitHub
commit 0dba450b5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java
View File

@ -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);
} }
} }