Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into configme-integration

src/main/java/fr/xephi/authme/datasource/MySQL.java

@@ -12,6 +12,7 @@ import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.DatabaseSettings;
 import fr.xephi.authme.settings.properties.HooksSettings;
 import fr.xephi.authme.settings.properties.SecuritySettings;
+import fr.xephi.authme.util.RuntimeUtils;
 import fr.xephi.authme.util.StringUtils;
 
 import java.sql.Blob;
@@ -100,6 +101,9 @@ public class MySQL implements DataSource {
         ds = new HikariDataSource();
         ds.setPoolName("AuthMeMYSQLPool");
 
+        // Pool size
+    	ds.setMaximumPoolSize(RuntimeUtils.getCoreCount());
+
         // Database URL
         ds.setJdbcUrl("jdbc:mysql://" + this.host + ":" + this.port + "/" + this.database);
 
@@ -118,7 +122,7 @@ public class MySQL implements DataSource {
 
         // Caching
         ds.addDataSourceProperty("cachePrepStmts", "true");
-        ds.addDataSourceProperty("prepStmtCacheSize", "250");
+        ds.addDataSourceProperty("prepStmtCacheSize", "275");
         ds.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");
 
         ConsoleLogger.info("Connection arguments loaded, Hikari ConnectionPool ready!");

src/main/java/fr/xephi/authme/permission/PermissionsManager.java

@@ -198,13 +198,13 @@ public class PermissionsManager implements Reloadable {
             return true;
         }
 
-        // Return if the player is an Op if sender is console or no permission system in use
+        // Return default if sender is not a player or no permission system is in use
         if (!(sender instanceof Player) || !isEnabled()) {
             return permissionNode.getDefaultPermission().evaluate(sender);
         }
 
         Player player = (Player) sender;
-        return handler.hasPermission(player, permissionNode);
+        return player.hasPermission(permissionNode.getNode());
     }
 
     /**

src/main/java/fr/xephi/authme/permission/handlers/BPermissionsHandler.java

@@ -22,11 +22,6 @@ public class BPermissionsHandler implements PermissionHandler {
         return true;
     }
 
-    @Override
-    public boolean hasPermission(Player player, PermissionNode node) {
-        return ApiLayer.hasPermission(player.getWorld().getName(), CalculableType.USER, player.getName(), node.getNode());
-    }
-
     @Override
     public boolean hasPermissionOffline(String name, PermissionNode node) {
         return ApiLayer.hasPermission(null, CalculableType.USER, name, node.getNode());

src/main/java/fr/xephi/authme/permission/handlers/GroupManagerHandler.java

@@ -29,12 +29,6 @@ public class GroupManagerHandler implements PermissionHandler {
         return true;
     }
 
-    @Override
-    public boolean hasPermission(Player player, PermissionNode node) {
-        final AnjoPermissionsHandler handler = groupManager.getWorldsHolder().getWorldPermissions(player);
-        return handler != null && handler.has(player, node.getNode());
-    }
-
     @Override
     public boolean hasPermissionOffline(String name, PermissionNode node) {
         final AnjoPermissionsHandler handler = groupManager.getWorldsHolder().getWorldPermissionsByPlayerName(name);

src/main/java/fr/xephi/authme/permission/handlers/PermissionHandler.java

@@ -28,16 +28,6 @@ public interface PermissionHandler {
      */
     boolean hasGroupSupport();
 
-    /**
-     * Check if a player has permission.
-     *
-     * @param player    The player.
-     * @param node The permission node.
-     *
-     * @return True if the player has permission.
-     */
-    boolean hasPermission(Player player, PermissionNode node);
-
     /**
      * Check if a player has permission by their name.
      * Used to check an offline player's permission.

src/main/java/fr/xephi/authme/permission/handlers/PermissionsBukkitHandler.java

@@ -20,11 +20,6 @@ public class PermissionsBukkitHandler implements PermissionHandler {
         return true;
     }
 
-    @Override
-    public boolean hasPermission(Player player, PermissionNode node) {
-        return player.hasPermission(node.getNode());
-    }
-
     @Override
     public boolean hasPermissionOffline(String name, PermissionNode node) {
         return false;

src/main/java/fr/xephi/authme/permission/handlers/PermissionsExHandler.java

@@ -37,12 +37,6 @@ public class PermissionsExHandler implements PermissionHandler {
         return true;
     }
 
-    @Override
-    public boolean hasPermission(Player player, PermissionNode node) {
-        PermissionUser user = permissionManager.getUser(player);
-        return user.has(node.getNode());
-    }
-
     @Override
     public boolean hasPermissionOffline(String name, PermissionNode node) {
         PermissionUser user = permissionManager.getUser(name);

src/main/java/fr/xephi/authme/permission/handlers/VaultHandler.java

@@ -44,11 +44,6 @@ public class VaultHandler implements PermissionHandler {
         return vaultProvider.hasGroupSupport();
     }
 
-    @Override
-    public boolean hasPermission(Player player, PermissionNode node) {
-        return vaultProvider.has(player, node.getNode());
-    }
-
     @Override
     public boolean hasPermissionOffline(String name, PermissionNode node) {
         return vaultProvider.has("", name, node.getNode());

src/main/java/fr/xephi/authme/permission/handlers/ZPermissionsHandler.java

@@ -33,15 +33,6 @@ public class ZPermissionsHandler implements PermissionHandler {
         return true;
     }
 
-    @Override
-    public boolean hasPermission(Player player, PermissionNode node) {
-        Map<String, Boolean> perms = zPermissionsService.getPlayerPermissions(player.getWorld().getName(), null, player.getName());
-        if (perms.containsKey(node.getNode()))
-            return perms.get(node.getNode());
-        else
-            return node.getDefaultPermission().evaluate(player);
-    }
-
     @Override
     public boolean hasPermissionOffline(String name, PermissionNode node) {
         Map<String, Boolean> perms = zPermissionsService.getPlayerPermissions(null, null, name);

src/main/java/fr/xephi/authme/util/RuntimeUtils.java

@@ -0,0 +1,7 @@
+package fr.xephi.authme.util;
+
+public class RuntimeUtils {
+	public static int getCoreCount() {
+		return Runtime.getRuntime().availableProcessors();
+	}
+}