Merge branch 'master' of https://github.com/AuthMe/AuthMeReloaded into 1141-optional-additional-2fa-auth

# Conflicts: # src/main/java/fr/xephi/authme/permission/PlayerPermission.java # src/main/java/fr/xephi/authme/service/BukkitService.java
2018-03-20 23:07:25 +01:00
parent 495cfc69a9 6251a69d3e
commit f66a8a5b06
43 changed files with 306 additions and 50 deletions
@@ -55,6 +55,10 @@ public final class ProtectionSettings implements SettingsHolder {
    public static final Property<Integer> ANTIBOT_DELAY =
        newProperty("Protection.antiBotDelay", 60);

+    @Comment("Kicks the player that issued a command before the defined time after the join process")
+    public static final Property<Integer> QUICK_COMMANDS_DENIED_BEFORE_MILLISECONDS =
+        newProperty("Protection.quickCommands.denyCommandsBeforeMilliseconds", 1000);
+
    private ProtectionSettings() {
    }