From 223d5078159290144f786d557e5b4b6c32787c8d Mon Sep 17 00:00:00 2001 From: Michal Charvat Date: Sun, 4 Sep 2011 14:11:57 +0200 Subject: [PATCH 1/2] Perfom censoring of xAuth commands every time (no override by settings in BigBrother.yml) --- src/main/java/me/taylorkelly/bigbrother/BBSettings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/taylorkelly/bigbrother/BBSettings.java b/src/main/java/me/taylorkelly/bigbrother/BBSettings.java index 21e909d..f2d3d56 100644 --- a/src/main/java/me/taylorkelly/bigbrother/BBSettings.java +++ b/src/main/java/me/taylorkelly/bigbrother/BBSettings.java @@ -169,6 +169,7 @@ else if (o instanceof String) { } censoredCommands = new ArrayList(); + censoredCommands = yml.getStringList("general.censored-commands", new ArrayList()); censoredCommands.add("/login"); // xAuth censoredCommands.add("/l"); // xAuth censoredCommands.add("/register"); // xAuth @@ -178,7 +179,6 @@ else if (o instanceof String) { censoredCommands.add("/changepassword"); // xAuth censoredCommands.add("/xauth"); // xAuth censoredCommands.add("/login"); // ? - censoredCommands = yml.getStringList("general.censored-commands", censoredCommands); List excludedWorlds = yml.getStringList("general.excluded-worlds", new ArrayList()); if (excludedWorlds == null) { From 28bb8f3a9c9c7c4b65b875dfb13841f226e47bcc Mon Sep 17 00:00:00 2001 From: Michal Charvat Date: Mon, 5 Sep 2011 13:15:24 +0200 Subject: [PATCH 2/2] revert of autoReconnect=true which cause issues atr some servers --- src/main/java/me/taylorkelly/bigbrother/datasource/BBDB.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/taylorkelly/bigbrother/datasource/BBDB.java b/src/main/java/me/taylorkelly/bigbrother/datasource/BBDB.java index d261f32..492fd3a 100644 --- a/src/main/java/me/taylorkelly/bigbrother/datasource/BBDB.java +++ b/src/main/java/me/taylorkelly/bigbrother/datasource/BBDB.java @@ -258,7 +258,7 @@ public static boolean needsUpdate(File dataFolder, String table, public static String getDSN() { switch (dbms) { case MYSQL: - return String.format("jdbc:mysql://%s:%d/%s?autoReconnect=true", hostname, port, schema); + return String.format("jdbc:mysql://%s:%d/%s", hostname, port, schema);// autoreconnect can cause problems case POSTGRES: return String.format("jdbc:postgresql://%s:%d/%s", hostname, port, schema); default: