Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-12-25 10:07:35 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #179 from AuthMe-Team/master

Browse Source 
Deprecated CS support, changed maven license
This commit is contained in:
Alexandre Vanhecke 2015-08-14 12:33:26 +02:00
commit b554ce824e
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -32,8 +32,8 @@
<licenses> <licenses>
<license> <license>
<name>Apache-2.0</name> <name>The GNU General Public Licence version 3 (GPLv3)</name>
<url>http://www.apache.org/licenses/LICENSE-2.0</url> <url>http://www.gnu.org/licenses/gpl-3.0.html</url>
</license> </license>
</licenses> </licenses>

8
src/main/java/fr/xephi/authme/settings/Settings.java
View File

@ -227,7 +227,7 @@ public final class Settings extends YamlConfiguration {
saltLength = configFile.getInt("settings.security.doubleMD5SaltLength", 8); saltLength = configFile.getInt("settings.security.doubleMD5SaltLength", 8);
getmaxRegPerEmail = configFile.getInt("Email.maxRegPerEmail", 1); getmaxRegPerEmail = configFile.getInt("Email.maxRegPerEmail", 1);
multiverse = configFile.getBoolean("Hooks.multiverse", true); multiverse = configFile.getBoolean("Hooks.multiverse", true);
chestshop = configFile.getBoolean("Hooks.chestshop", true); chestshop = configFile.getBoolean("Hooks.legacyChestshop", false);
bungee = configFile.getBoolean("Hooks.bungeecord", false); bungee = configFile.getBoolean("Hooks.bungeecord", false);
getForcedWorlds = configFile.getStringList("settings.restrictions.ForceSpawnOnTheseWorlds"); getForcedWorlds = configFile.getStringList("settings.restrictions.ForceSpawnOnTheseWorlds");
banUnsafeIp = configFile.getBoolean("settings.restrictions.banUnsafedIP", false); banUnsafeIp = configFile.getBoolean("settings.restrictions.banUnsafedIP", false);
@ -449,6 +449,12 @@ public final class Settings extends YamlConfiguration {
} }
if (contains("Hooks.notifications")) if (contains("Hooks.notifications"))
set("Hooks.notifications", null); 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")) { if (!contains("Email.generateImage")) {
set("Email.generateImage", true); set("Email.generateImage", true);
changes = true; changes = true;

4
src/main/resources/config.yml
View File

@ -367,8 +367,8 @@ Email:
Hooks: Hooks:
# Do we need to hook with multiverse for spawn checking? # Do we need to hook with multiverse for spawn checking?
multiverse: true multiverse: true
# Do we need to hook with ChestShop for prevent buy or selling ? # Do we need to hook with legacy ChestShop < 3.8.13 for prevent buy or selling ?
chestshop: true legacyChestshop: false
# Do we need to hook with BungeeCord for get the real Player ip ? # Do we need to hook with BungeeCord for get the real Player ip ?
bungeecord: false bungeecord: false
# Do we need to disable Essentials SocialSpy on join ? # Do we need to disable Essentials SocialSpy on join ?