diff options
| author | snowleo <schneeleo@gmail.com> | 2014-02-18 23:47:18 +0100 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2014-02-18 23:47:18 +0100 |
| commit | 3f2c2aadbbfbe806f25200d71b1cd30e1d4f7bee (patch) | |
| tree | dfadd46aea24e9b91572797fe0968b269958c60a | |
| parent | a1a190bb026762d254146b990f7c27edcb0aa4ea (diff) | |
| download | Essentials-3f2c2aadbbfbe806f25200d71b1cd30e1d4f7bee.tar Essentials-3f2c2aadbbfbe806f25200d71b1cd30e1d4f7bee.tar.gz Essentials-3f2c2aadbbfbe806f25200d71b1cd30e1d4f7bee.tar.lz Essentials-3f2c2aadbbfbe806f25200d71b1cd30e1d4f7bee.tar.xz Essentials-3f2c2aadbbfbe806f25200d71b1cd30e1d4f7bee.zip | |
Split unsafe enchantments in kits to a new config option
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/ISettings.java | 2 | ||||
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/Kit.java | 2 | ||||
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/Settings.java | 6 | ||||
| -rw-r--r-- | 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 @@ -945,6 +945,12 @@ public class Settings implements net.ess3.api.ISettings } @Override + public boolean allowUnsafeEnchantmentsInKits() + { + return config.getBoolean("unsafe-enchantments-in-kits", config.getBoolean("unsafe-enchantments", false)); + } + + @Override public boolean allowUnsafeEnchantments() { return config.getBoolean("unsafe-enchantments", false); 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 |