From e409363426a3240f28ff55ab0b2991ad90853b4e Mon Sep 17 00:00:00 2001 From: KHobbits Date: Wed, 19 Feb 2014 01:17:05 +0000 Subject: Alternative implementation of unsafe enchant blocking for signs. Permission: essentials.signs.enchant.allowunsafe - required to add unsafe enchants using enchant signs. This reverts commit 3f2c2aadbbfbe806f25200d71b1cd30e1d4f7bee. --- 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/com/earth2me/essentials/signs/SignEnchant.java | 5 +++-- Essentials/src/config.yml | 6 +----- Essentials/test/com/earth2me/essentials/FakeServer.java | 6 ++++++ 6 files changed, 11 insertions(+), 16 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/ISettings.java b/Essentials/src/com/earth2me/essentials/ISettings.java index e38891b47..b48cf7d91 100644 --- a/Essentials/src/com/earth2me/essentials/ISettings.java +++ b/Essentials/src/com/earth2me/essentials/ISettings.java @@ -155,8 +155,6 @@ 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 02d82a9e3..21a948784 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().allowUnsafeEnchantmentsInKits(); + final boolean allowUnsafe = ess.getSettings().allowUnsafeEnchantments(); 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 0136aa728..ebeb2a12c 100644 --- a/Essentials/src/com/earth2me/essentials/Settings.java +++ b/Essentials/src/com/earth2me/essentials/Settings.java @@ -944,12 +944,6 @@ 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/com/earth2me/essentials/signs/SignEnchant.java b/Essentials/src/com/earth2me/essentials/signs/SignEnchant.java index c5120b8e2..a3ca29591 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignEnchant.java +++ b/Essentials/src/com/earth2me/essentials/signs/SignEnchant.java @@ -50,7 +50,8 @@ public class SignEnchant extends EssentialsSign sign.setLine(2, "§c"); throw new SignException(ex.getMessage(), ex); } - final boolean allowUnsafe = ess.getSettings().allowUnsafeEnchantments() && player.isAuthorized("essentials.enchantments.allowunsafe"); + final boolean allowUnsafe = ess.getSettings().allowUnsafeEnchantments() + && player.isAuthorized("essentials.enchantments.allowunsafe") && player.isAuthorized("essentials.signs.enchant.allowunsafe"); if (level < 0 || (!allowUnsafe && level > enchantment.getMaxLevel())) { level = enchantment.getMaxLevel(); @@ -127,7 +128,7 @@ public class SignEnchant extends EssentialsSign } else { - if (ess.getSettings().allowUnsafeEnchantments()) + if (ess.getSettings().allowUnsafeEnchantments() && player.isAuthorized("essentials.signs.enchant.allowunsafe")) { toEnchant.addUnsafeEnchantment(enchantment, level); } diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml index d9515233a..e74172c49 100644 --- a/Essentials/src/config.yml +++ b/Essentials/src/config.yml @@ -395,11 +395,7 @@ oversized-stacksize: 64 # essentials.repair.enchanted repair-enchanted: true -# 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. +# Allow 'unsafe' enchantments in kits and item spawning. # Warning: Mixing and overleveling some enchantments can cause issues with clients, servers and plugins. unsafe-enchantments: false diff --git a/Essentials/test/com/earth2me/essentials/FakeServer.java b/Essentials/test/com/earth2me/essentials/FakeServer.java index b16ff3ea0..443cf55b2 100644 --- a/Essentials/test/com/earth2me/essentials/FakeServer.java +++ b/Essentials/test/com/earth2me/essentials/FakeServer.java @@ -1195,4 +1195,10 @@ public class FakeServer implements Server { throw new UnsupportedOperationException("Not supported yet."); } + + @Override + public BanList getBanList(BanList.Type arg0) + { + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + } } -- cgit v1.2.3