From 9f8c9db4bc417261173c3119f53539a9b36bbc24 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Mon, 14 Jan 2019 20:37:30 -0800 Subject: [PATCH] Setting SSL to false will now squelch MySQL warnings --- .../java/com/gmail/nossr50/database/SQLDatabaseManager.java | 3 +++ .../nossr50/datatypes/skills/subskills/acrobatics/Roll.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java b/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java index a00c972e0..1ebcabd5c 100644 --- a/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java +++ b/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java @@ -41,6 +41,9 @@ public final class SQLDatabaseManager implements DatabaseManager { "?verifyServerCertificate=false"+ "&useSSL=true"+ "&requireSSL=true"; + else + connectionString+= + "?useSSL=false"; try { // Force driver to load if not yet loaded diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java b/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java index bbbe95f9d..65204d626 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java +++ b/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java @@ -204,7 +204,7 @@ public class Roll extends AcrobaticsSubSkill implements RandomChance { } private boolean canRoll(Player player) { - return !exploitPrevention(player) && Permissions.isSubSkillEnabled(player, SubSkillType.ACROBATICS_ROLL); + return !isExploiting(player) && Permissions.isSubSkillEnabled(player, SubSkillType.ACROBATICS_ROLL); } /** @@ -281,7 +281,7 @@ public class Roll extends AcrobaticsSubSkill implements RandomChance { * * @return true if exploits are detected, false otherwise */ - private boolean exploitPrevention(Player player) { + private boolean isExploiting(Player player) { if (!Config.getInstance().getAcrobaticsPreventAFK()) { return false; }