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

2018-05-01 22:49:23 +02:00
parent 1e3ed795c1 b69767c705
commit 6f2f7a73af
33 changed files with 195 additions and 92 deletions
@@ -32,7 +32,7 @@ public enum AllowFlightRestoreType {
        }
    },

-    /** Always set flight enabled to false. */
+    /** The user's flight handling is not modified. */
    NOTHING {
        @Override
        public void restoreAllowFlight(Player player, LimboPlayer limbo) {