Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into antibot-improvement

Conflicts: src/main/java/fr/xephi/authme/service/AntiBotService.java
2016-10-30 08:56:16 +01:00
parent cbd9add1b7 b3e276d277
commit 7a43703d52
73 changed files with 2075 additions and 1163 deletions
@@ -51,6 +51,7 @@ public class AntiBotServiceTest {
    @BeforeInjecting
    public void initSettings() {
        given(settings.getProperty(ProtectionSettings.ANTIBOT_DURATION)).willReturn(10);
+        given(settings.getProperty(ProtectionSettings.ANTIBOT_INTERVAL)).willReturn(5);
        given(settings.getProperty(ProtectionSettings.ANTIBOT_SENSIBILITY)).willReturn(5);
        given(settings.getProperty(ProtectionSettings.ENABLE_ANTIBOT)).willReturn(true);
        given(settings.getProperty(ProtectionSettings.ANTIBOT_DELAY)).willReturn(8);