From 3f2c2aadbbfbe806f25200d71b1cd30e1d4f7bee Mon Sep 17 00:00:00 2001 From: snowleo Date: Tue, 18 Feb 2014 23:47:18 +0100 Subject: Split unsafe enchantments in kits to a new config option --- Essentials/src/com/earth2me/essentials/ISettings.java | 2 ++ Essentials/src/com/earth2me/essentials/Kit.java | 2 +- Essentials/src/com/earth2me/essentials/Settings.java | 6 ++++++ Essentials/src/config.yml | 6 +++++- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/ISettings.java b/Essentials/src/com/earth2me/essentials/ISettings.java index b48cf7d91..e38891b47 100644 --- a/Essentials/src/com/earth2me/essentials/ISettings.java +++ b/Essentials/src/com/earth2me/essentials/ISettings.java @@ -155,6 +155,8 @@ public interface ISettings extends IConf boolean getUpdateBedAtDaytime(); boolean allowUnsafeEnchantments(); + + boolean allowUnsafeEnchantmentsInKits(); boolean getRepairEnchanted(); diff --git a/Essentials/src/com/earth2me/essentials/Kit.java b/Essentials/src/com/earth2me/essentials/Kit.java index 21a948784..02d82a9e3 100644 --- a/Essentials/src/com/earth2me/essentials/Kit.java +++ b/Essentials/src/com/earth2me/essentials/Kit.java @@ -174,7 +174,7 @@ public class Kit IText output = new KeywordReplacer(input, user.getSource(), ess); boolean spew = false; - final boolean allowUnsafe = ess.getSettings().allowUnsafeEnchantments(); + final boolean allowUnsafe = ess.getSettings().allowUnsafeEnchantmentsInKits(); for (String kitItem : output.getLines()) { if (kitItem.startsWith(ess.getSettings().getCurrencySymbol())) diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java index ebeb2a12c..0136aa728 100644 --- a/Essentials/src/com/earth2me/essentials/Settings.java +++ b/Essentials/src/com/earth2me/essentials/Settings.java @@ -944,6 +944,12 @@ public class Settings implements net.ess3.api.ISettings return config.getBoolean("repair-enchanted", true); } + @Override + public boolean allowUnsafeEnchantmentsInKits() + { + return config.getBoolean("unsafe-enchantments-in-kits", config.getBoolean("unsafe-enchantments", false)); + } + @Override public boolean allowUnsafeEnchantments() { diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml index e74172c49..d9515233a 100644 --- a/Essentials/src/config.yml +++ b/Essentials/src/config.yml @@ -395,7 +395,11 @@ oversized-stacksize: 64 # essentials.repair.enchanted repair-enchanted: true -# Allow 'unsafe' enchantments in kits and item spawning. +# Allow 'unsafe' enchantments in kits. +# Warning: Mixing and overleveling some enchantments can cause issues with clients, servers and plugins. +unsafe-enchantments-in-kits: false + +# Allow 'unsafe' enchantments in item spawning. # Warning: Mixing and overleveling some enchantments can cause issues with clients, servers and plugins. unsafe-enchantments: false -- cgit v1.2.3