diff --git a/Changelog.txt b/Changelog.txt index ca84bffad..d68d29e9a 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -10,6 +10,7 @@ Key: Version 1.4.03-dev = Fixed bug where players were unable to salvage leather armor = Fixed bug with repairing using materials with byte metadata + - Removed option to disable Salvage via the config file. This should be handled via permissions instead. Version 1.4.02 + Added API to get the skill and power level caps. diff --git a/src/main/java/com/gmail/nossr50/config/Config.java b/src/main/java/com/gmail/nossr50/config/Config.java index 86d6ee56b..93f3e8bad 100644 --- a/src/main/java/com/gmail/nossr50/config/Config.java +++ b/src/main/java/com/gmail/nossr50/config/Config.java @@ -183,7 +183,6 @@ public class Config extends AutoUpdateConfigLoader { /* Repair */ public boolean getRepairAnvilMessagesEnabled() { return config.getBoolean("Skills.Repair.Anvil_Messages", true); } public int getRepairAnvilId() { return config.getInt("Skills.Repair.Anvil_ID", 42); } - public boolean getSalvageEnabled() { return config.getBoolean("Skills.Repair.Salvage_enabled", true); } public int getSalvageAnvilId() { return config.getInt("Skills.Repair.Salvage_Anvil_ID", 41); } public int getSalvageUnlockLevel() { return config.getInt("Skills.Repair.Salvage_UnlockLevel", 600); } public boolean getSalvageTools() { return config.getBoolean("Skills.Repair.Salvage_tools", true); } 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 5f8004e5e..12e5436e9 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java @@ -176,7 +176,7 @@ public class RepairManager extends SkillManager { public void handleSalvage(Location location, ItemStack item) { Player player = getPlayer(); - if (!Config.getInstance().getSalvageEnabled() || player.getGameMode() != GameMode.SURVIVAL) { + if (player.getGameMode() != GameMode.SURVIVAL) { return; } diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 7466dcc75..af3d51c3a 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -160,7 +160,6 @@ Skills: Level_Cap: 0 Anvil_Messages: true Anvil_ID: 42 - Salvage_enabled: true Salvage_Anvil_ID: 41 Salvage_UnlockLevel: 600 Salvage_tools: true