Merge branch 'master' into db-improve

Conflicts: src/main/java/fr/xephi/authme/AuthMe.java
2016-02-26 12:42:32 +07:00
parent 775e2f7039 1b65b285ac
commit 8324decfa1
61 changed files with 1086 additions and 510 deletions
@@ -179,8 +179,8 @@ public class CacheDataSource implements DataSource {
    }

    @Override
-    public synchronized List<String> getAllAuthsByEmail(final String email) {
-        return source.getAllAuthsByEmail(email);
+    public synchronized int countAuthsByEmail(final String email) {
+        return source.countAuthsByEmail(email);
    }

    @Override