From 57c30bac98dff87bcffb3e8e06e3522ff1e448db Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Mon, 23 Sep 2019 13:30:21 -0700
Subject: [PATCH] Fix Salvage, Swords and Unarmed command

---
 .../com/gmail/nossr50/commands/skills/SalvageCommand.java   | 5 ++---
 .../gmail/nossr50/commands/skills/SkillGuideCommand.java    | 6 +++---
 .../com/gmail/nossr50/commands/skills/SwordsCommand.java    | 6 +-----
 .../com/gmail/nossr50/commands/skills/UnarmedCommand.java   | 6 +-----
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/commands/skills/SalvageCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/SalvageCommand.java
index 0cc8e43a4..7fbc0c076 100644
--- a/src/main/java/com/gmail/nossr50/commands/skills/SalvageCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/SalvageCommand.java
@@ -3,7 +3,6 @@ package com.gmail.nossr50.commands.skills;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.skills.salvage.Salvage;
 import com.gmail.nossr50.skills.salvage.SalvageManager;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
@@ -48,11 +47,11 @@ public class SalvageCommand extends SkillCommand {
                     String.valueOf(salvageManager.getArcaneSalvageRank()),
                     String.valueOf(pluginRef.getRankTools().getHighestRank(SubSkillType.SALVAGE_ARCANE_SALVAGE))));
 
-            if (Salvage.arcaneSalvageEnchantLoss) {
+            if (pluginRef.getDynamicSettingsManager().getSkillBehaviourManager().getSalvageBehaviour().isArcaneSalvageEnchantLoss()) {
                 messages.add(pluginRef.getLocaleManager().getString("Ability.Generic.Template", pluginRef.getLocaleManager().getString("Salvage.Arcane.ExtractFull"), percent.format(salvageManager.getExtractFullEnchantChance() / 100)));
             }
 
-            if (Salvage.arcaneSalvageDowngrades) {
+            if (pluginRef.getDynamicSettingsManager().getSkillBehaviourManager().getSalvageBehaviour().isArcaneSalvageDowngrades()) {
                 messages.add(pluginRef.getLocaleManager().getString("Ability.Generic.Template", pluginRef.getLocaleManager().getString("Salvage.Arcane.ExtractPartial"), percent.format(salvageManager.getExtractPartialEnchantChance() / 100)));
             }
         }
diff --git a/src/main/java/com/gmail/nossr50/commands/skills/SkillGuideCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/SkillGuideCommand.java
index 5ea7b242d..a65447a75 100644
--- a/src/main/java/com/gmail/nossr50/commands/skills/SkillGuideCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/SkillGuideCommand.java
@@ -16,9 +16,9 @@ public class SkillGuideCommand implements CommandExecutor {
     private String invalidPage;
     private final mcMMO pluginRef;
 
-    public SkillGuideCommand(PrimarySkillType skill, mcMMO pluginRef) {
-        header = pluginRef.getLocaleManager().getString("Guides.Header", skill.getLocalizedSkillName());
-        guide = getGuide(skill);
+    public SkillGuideCommand(PrimarySkillType primarySkillType, mcMMO pluginRef) {
+        header = pluginRef.getLocaleManager().getString("Guides.Header", pluginRef.getSkillTools().getLocalizedSkillName(primarySkillType));
+        guide = getGuide(primarySkillType);
         invalidPage = pluginRef.getLocaleManager().getString("Guides.Page.Invalid");
         this.pluginRef = pluginRef;
     }
diff --git a/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java
index 71790ac51..c8ab45954 100644
--- a/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java
@@ -98,11 +98,7 @@ public class SwordsCommand extends SkillCommand {
 
         if (canUseSubSkill(player, SubSkillType.SWORDS_SWORDS_LIMIT_BREAK)) {
             messages.add(getStatMessage(SubSkillType.SWORDS_SWORDS_LIMIT_BREAK,
-<<<<<<< HEAD
-                    String.valueOf(pluginRef.getCombatTools().getLimitBreakDamage(player, SubSkillType.SWORDS_SWORDS_LIMIT_BREAK))));
-=======
-                    String.valueOf(CombatUtils.getLimitBreakDamageAgainstQuality(player, SubSkillType.SWORDS_SWORDS_LIMIT_BREAK, 1000))));
->>>>>>> 308e3a4b1f46e9e3de28d6d540dd055a540ed4d5
+                    String.valueOf(pluginRef.getCombatTools().getLimitBreakDamageAgainstQuality(player, SubSkillType.SWORDS_SWORDS_LIMIT_BREAK, 1000))));
         }
 
         return messages;
diff --git a/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java
index 8c493628d..4ddd4b9ab 100644
--- a/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java
@@ -110,11 +110,7 @@ public class UnarmedCommand extends SkillCommand {
 
         if (canUseSubSkill(player, SubSkillType.UNARMED_UNARMED_LIMIT_BREAK)) {
             messages.add(getStatMessage(SubSkillType.UNARMED_UNARMED_LIMIT_BREAK,
-<<<<<<< HEAD
-                    String.valueOf(pluginRef.getCombatTools().getLimitBreakDamage(player, SubSkillType.UNARMED_UNARMED_LIMIT_BREAK))));
-=======
-                    String.valueOf(CombatUtils.getLimitBreakDamageAgainstQuality(player, SubSkillType.UNARMED_UNARMED_LIMIT_BREAK, 1000))));
->>>>>>> 308e3a4b1f46e9e3de28d6d540dd055a540ed4d5
+                    String.valueOf(pluginRef.getCombatTools().getLimitBreakDamageAgainstQuality(player, SubSkillType.UNARMED_UNARMED_LIMIT_BREAK, 1000))));
         }
 
         return messages;