diff --git a/core/src/main/java/me/blackvein/quests/Quests.java b/core/src/main/java/me/blackvein/quests/Quests.java index ad559cf3c..76cfc2960 100644 --- a/core/src/main/java/me/blackvein/quests/Quests.java +++ b/core/src/main/java/me/blackvein/quests/Quests.java @@ -492,7 +492,7 @@ public class Quests extends JavaPlugin implements QuestsAPI { return null; } final ConcurrentSkipListSet set = (ConcurrentSkipListSet) questers; - for (final IQuester q: set) { + for (final IQuester q : set) { if (q != null && q.getUUID().equals(id)) { return (Quester) q; } @@ -1707,7 +1707,7 @@ public class Quests extends JavaPlugin implements QuestsAPI { } /** - * Reload quests, actions, config settings, lang and modules, and player data + * Reload quests, actions, conditions, config settings, lang, modules, and player data */ public void reload(final ReloadCallback callback) { if (loading) { diff --git a/core/src/main/java/me/blackvein/quests/listeners/BlockListener.java b/core/src/main/java/me/blackvein/quests/listeners/BlockListener.java index 4a09a35b2..b084baf3c 100644 --- a/core/src/main/java/me/blackvein/quests/listeners/BlockListener.java +++ b/core/src/main/java/me/blackvein/quests/listeners/BlockListener.java @@ -316,7 +316,7 @@ public class BlockListener implements Listener { } catch (final NoSuchMethodError err) { // Do nothing, getHand() not present pre-1.9 } - if (e == null || e.equals(EquipmentSlot.HAND)) { //If the event is fired by HAND (main hand) + if (e == null || e.equals(EquipmentSlot.HAND)) { // If the event is fired by HAND (main hand) final Player player = evt.getPlayer(); if (plugin.canUseQuests(evt.getPlayer().getUniqueId())) { final IQuester quester = plugin.getQuester(player.getUniqueId()); diff --git a/core/src/main/java/me/blackvein/quests/logging/QuestsLog4JFilter.java b/core/src/main/java/me/blackvein/quests/logging/QuestsLog4JFilter.java index 5e22d2356..e830231e0 100644 --- a/core/src/main/java/me/blackvein/quests/logging/QuestsLog4JFilter.java +++ b/core/src/main/java/me/blackvein/quests/logging/QuestsLog4JFilter.java @@ -39,6 +39,10 @@ public class QuestsLog4JFilter extends AbstractFilter { if (message.contains("[PikaMug]")) { return Result.DENY; } + // Hikari outputs these messages as ERROR which concerns some + if (message.contains("quests-hikari - Shutdown")) { + return Result.DENY; + } // Paper outputs errors when dependencies for module events are missing return (message.contains("Plugin Quests") && message.contains("failed to register events")) ? Result.DENY : Result.NEUTRAL; diff --git a/core/src/main/java/me/blackvein/quests/storage/implementation/sql/connection/hikari/MySqlConnectionFactory.java b/core/src/main/java/me/blackvein/quests/storage/implementation/sql/connection/hikari/MySqlConnectionFactory.java index cbc2494f0..dd5dff577 100644 --- a/core/src/main/java/me/blackvein/quests/storage/implementation/sql/connection/hikari/MySqlConnectionFactory.java +++ b/core/src/main/java/me/blackvein/quests/storage/implementation/sql/connection/hikari/MySqlConnectionFactory.java @@ -67,6 +67,6 @@ public class MySqlConnectionFactory extends HikariConnectionFactory { @Override public Function getStatementProcessor() { - return s -> s.replace("'", "`"); + return s -> s.replace('\'', '`'); } }