diff --git a/pom.xml b/pom.xml index a629a91a..2eab1959 100644 --- a/pom.xml +++ b/pom.xml @@ -32,8 +32,8 @@ - Apache-2.0 - http://www.apache.org/licenses/LICENSE-2.0 + The GNU General Public Licence version 3 (GPLv3) + http://www.gnu.org/licenses/gpl-3.0.html diff --git a/src/main/java/fr/xephi/authme/settings/Settings.java b/src/main/java/fr/xephi/authme/settings/Settings.java index 45b4139c..54dcf2c1 100644 --- a/src/main/java/fr/xephi/authme/settings/Settings.java +++ b/src/main/java/fr/xephi/authme/settings/Settings.java @@ -227,7 +227,7 @@ public final class Settings extends YamlConfiguration { saltLength = configFile.getInt("settings.security.doubleMD5SaltLength", 8); getmaxRegPerEmail = configFile.getInt("Email.maxRegPerEmail", 1); multiverse = configFile.getBoolean("Hooks.multiverse", true); - chestshop = configFile.getBoolean("Hooks.chestshop", true); + chestshop = configFile.getBoolean("Hooks.legacyChestshop", false); bungee = configFile.getBoolean("Hooks.bungeecord", false); getForcedWorlds = configFile.getStringList("settings.restrictions.ForceSpawnOnTheseWorlds"); banUnsafeIp = configFile.getBoolean("settings.restrictions.banUnsafedIP", false); @@ -449,6 +449,12 @@ public final class Settings extends YamlConfiguration { } if (contains("Hooks.notifications")) set("Hooks.notifications", null); + boolean useChestShop = false; + if (contains("Hooks.chestshop")) { + useChestShop = getBoolean("Hooks.chestshop"); + set("Hooks.chestshop", null); + } + set("Hooks.legacyChestshop", useChestShop); if (!contains("Email.generateImage")) { set("Email.generateImage", true); changes = true; diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index b98ce851..89f16d2c 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -367,8 +367,8 @@ Email: Hooks: # Do we need to hook with multiverse for spawn checking? multiverse: true - # Do we need to hook with ChestShop for prevent buy or selling ? - chestshop: true + # Do we need to hook with legacy ChestShop < 3.8.13 for prevent buy or selling ? + legacyChestshop: false # Do we need to hook with BungeeCord for get the real Player ip ? bungeecord: false # Do we need to disable Essentials SocialSpy on join ?