Selaa lähdekoodia

Removed option to disable Salvage via the config file. This should be
handled via permissions instead.

GJ 12 vuotta sitten
vanhempi
sitoutus
2c7f931c4d

+ 1 - 0
Changelog.txt

@@ -10,6 +10,7 @@ Key:
 Version 1.4.03-dev
 Version 1.4.03-dev
  = Fixed bug where players were unable to salvage leather armor
  = Fixed bug where players were unable to salvage leather armor
  = Fixed bug with repairing using materials with byte metadata
  = 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
 Version 1.4.02
  + Added API to get the skill and power level caps.
  + Added API to get the skill and power level caps.

+ 0 - 1
src/main/java/com/gmail/nossr50/config/Config.java

@@ -183,7 +183,6 @@ public class Config extends AutoUpdateConfigLoader {
     /* Repair */
     /* Repair */
     public boolean getRepairAnvilMessagesEnabled() { return config.getBoolean("Skills.Repair.Anvil_Messages", true); }
     public boolean getRepairAnvilMessagesEnabled() { return config.getBoolean("Skills.Repair.Anvil_Messages", true); }
     public int getRepairAnvilId() { return config.getInt("Skills.Repair.Anvil_ID", 42); }
     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 getSalvageAnvilId() { return config.getInt("Skills.Repair.Salvage_Anvil_ID", 41); }
     public int getSalvageUnlockLevel() { return config.getInt("Skills.Repair.Salvage_UnlockLevel", 600); }
     public int getSalvageUnlockLevel() { return config.getInt("Skills.Repair.Salvage_UnlockLevel", 600); }
     public boolean getSalvageTools() { return config.getBoolean("Skills.Repair.Salvage_tools", true); }
     public boolean getSalvageTools() { return config.getBoolean("Skills.Repair.Salvage_tools", true); }

+ 1 - 1
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) {
     public void handleSalvage(Location location, ItemStack item) {
         Player player = getPlayer();
         Player player = getPlayer();
 
 
-        if (!Config.getInstance().getSalvageEnabled() || player.getGameMode() != GameMode.SURVIVAL) {
+        if (player.getGameMode() != GameMode.SURVIVAL) {
             return;
             return;
         }
         }
 
 

+ 0 - 1
src/main/resources/config.yml

@@ -160,7 +160,6 @@ Skills:
         Level_Cap: 0
         Level_Cap: 0
         Anvil_Messages: true
         Anvil_Messages: true
         Anvil_ID: 42
         Anvil_ID: 42
-        Salvage_enabled: true
         Salvage_Anvil_ID: 41
         Salvage_Anvil_ID: 41
         Salvage_UnlockLevel: 600
         Salvage_UnlockLevel: 600
         Salvage_tools: true
         Salvage_tools: true