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
@@ -70,6 +70,11 @@ public enum PlayerPermission implements PermissionNode {
     */
    VERIFICATION_CODE("authme.player.security.verificationcode"),

+    /**
+     * Permission that enables on join quick commands checks for the player.
+     */
+    QUICK_COMMANDS_PROTECTION("authme.player.protection.quickcommandsprotection"),
+
    /**
     * Permission to enable two-factor authentication.
     */