Merge remote-tracking branch 'origin/master' into jsoncache-fix

Conflicts: src/main/java/fr/xephi/authme/settings/Settings.java
2016-07-03 19:53:55 +07:00
parent 0283395da4 8f5817883e
commit 7ea0763966
38 changed files with 488 additions and 567 deletions
@@ -111,10 +111,6 @@ public class ProcessSyncPlayerLogin implements SynchronousProcess {
                restoreInventory(player);
            }

-            if (service.getProperty(RestrictionSettings.HIDE_TABLIST_BEFORE_LOGIN)) {
-                protocolLibService.sendTabList(player);
-            }
-
            // Clean up no longer used temporary data
            limboCache.deleteLimboPlayer(player);
        }