From c7fadf02e6230e7569502d9f3348118eabe01461 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Fri, 21 Jun 2019 05:50:37 -0700 Subject: [PATCH] Repair rewrite continues --- Changelog.txt | 4 ++-- .../java/com/gmail/nossr50/skills/salvage/SalvageManager.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index 30082c20e..93734c18f 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -3,7 +3,7 @@ Version 2.2.0 !!!!!!!!!!!!!!!!!!!!!!!! This changelog is not complete, I'll be going over it and cleaning it up once 2.2 is close to release !!!!!!!!!!!!!!!!!!!!!!!! - !!!!!!!!!!!!!!!!!!!!!!!!mvn clea + !!!!!!!!!!!!!!!!!!!!!!!! mcMMO's config system has been rewritten Nearly every config setting has been renamed and most have brand new comments You can now add an unlimited number of custom XP perks with custom defined XP boosts @@ -11,7 +11,7 @@ Version 2.2.0 mcMMO will now warn you in the console if it thinks you are running incompatible server software Parties no longer have a cap, you can level them forever for bragging rights You can now specify multiple repair-items for an item (such as specifying that a wooden sword can be repaired by all types of planks) - Repair no longer consumes materials with item lore, players are informed that they cannot repair with that material if its the only matching repair material in their inventory + Repair config has been rewritten and expanded to support much more complex settings Removed the following Repair/Salvage permissions mcmmo.ability.repair.stonerepair mcmmo.ability.repair.stringrepair diff --git a/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java b/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java index 07007eeed..85a2cc490 100644 --- a/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java +++ b/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java @@ -124,7 +124,7 @@ public class SalvageManager extends SkillManager { } } - if(lotteryResults == salvageableAmount && salvageableAmount != 1) { + if(lotteryResults == salvageableAmount && salvageableAmount != 1 && RankUtils.isPlayerMaxRankInSubSkill(player, SubSkillType.SALVAGE_ARCANE_SALVAGE)) { mcMMO.getNotificationManager().sendPlayerInformationChatOnly(player, "Salvage.Skills.Lottery.Perfect", String.valueOf(lotteryResults), StringUtils.getPrettyItemString(item.getType())); } else if(RankUtils.isPlayerMaxRankInSubSkill(player, SubSkillType.SALVAGE_ARCANE_SALVAGE) || salvageableAmount == 1) { mcMMO.getNotificationManager().sendPlayerInformationChatOnly(player, "Salvage.Skills.Lottery.Normal", String.valueOf(lotteryResults), StringUtils.getPrettyItemString(item.getType()));