diff --git a/src/main/java/de/diddiz/LogBlock/LogBlock.java b/src/main/java/de/diddiz/LogBlock/LogBlock.java index 6078aa1..613162b 100644 --- a/src/main/java/de/diddiz/LogBlock/LogBlock.java +++ b/src/main/java/de/diddiz/LogBlock/LogBlock.java @@ -175,7 +175,7 @@ public class LogBlock extends JavaPlugin { if (isLogging(Logging.KILL)) { pm.registerEvents(new KillLogging(this), this); } - if (isLogging(Logging.CHAT)) { + if (isLogging(Logging.CHAT) || isLogging(Logging.PLAYER_COMMANDS) || isLogging(Logging.CONSOLE_COMMANDS) || isLogging(Logging.COMMANDBLOCK_COMMANDS)) { pm.registerEvents(new ChatLogging(this), this); } if (isLogging(Logging.ENDERMEN)) { diff --git a/src/main/java/de/diddiz/LogBlock/QueryParams.java b/src/main/java/de/diddiz/LogBlock/QueryParams.java index dd5ad50..feb9d27 100644 --- a/src/main/java/de/diddiz/LogBlock/QueryParams.java +++ b/src/main/java/de/diddiz/LogBlock/QueryParams.java @@ -975,7 +975,7 @@ public final class QueryParams implements Cloneable { } } if (bct == BlockChangeType.CHAT) { - if (!Config.isLogging(Logging.CHAT)) { + if (!(isLogging(Logging.CHAT) || isLogging(Logging.PLAYER_COMMANDS) || isLogging(Logging.CONSOLE_COMMANDS) || isLogging(Logging.COMMANDBLOCK_COMMANDS))) { throw new IllegalArgumentException("Chat is not logged"); } if (sum != SummarizationMode.NONE) { diff --git a/src/main/java/de/diddiz/LogBlock/Updater.java b/src/main/java/de/diddiz/LogBlock/Updater.java index 42ff25a..dcdfec3 100644 --- a/src/main/java/de/diddiz/LogBlock/Updater.java +++ b/src/main/java/de/diddiz/LogBlock/Updater.java @@ -47,7 +47,7 @@ class Updater { // } if (configVersion.compareTo(new ComparableVersion("1.2.7")) < 0) { logblock.getLogger().info("Updating tables to 1.2.7 ..."); - if (isLogging(Logging.CHAT)) { + if (isLogging(Logging.CHAT) || isLogging(Logging.PLAYER_COMMANDS) || isLogging(Logging.CONSOLE_COMMANDS) || isLogging(Logging.COMMANDBLOCK_COMMANDS)) { final Connection conn = logblock.getConnection(); try { conn.setAutoCommit(true); @@ -376,7 +376,7 @@ class Updater { conn.setAutoCommit(true); final Statement st = conn.createStatement(); checkCharset("lb-players", "name", st, false); - if (isLogging(Logging.CHAT)) { + if (isLogging(Logging.CHAT) || isLogging(Logging.PLAYER_COMMANDS) || isLogging(Logging.CONSOLE_COMMANDS) || isLogging(Logging.COMMANDBLOCK_COMMANDS)) { checkCharset("lb-chat", "message", st, false); } for (final WorldConfig wcfg : getLoggedWorlds()) { @@ -395,7 +395,7 @@ class Updater { if (configVersion.compareTo(new ComparableVersion("1.12.0")) < 0) { logblock.getLogger().info("Updating tables to 1.12.0 ..."); - if (isLogging(Logging.CHAT)) { + if (isLogging(Logging.CHAT) || isLogging(Logging.PLAYER_COMMANDS) || isLogging(Logging.CONSOLE_COMMANDS) || isLogging(Logging.COMMANDBLOCK_COMMANDS)) { final Connection conn = logblock.getConnection(); try { conn.setAutoCommit(true); @@ -739,7 +739,7 @@ class Updater { conn.setAutoCommit(true); final Statement st = conn.createStatement(); checkCharset("lb-players", "name", st, true); - if (isLogging(Logging.CHAT)) { + if (isLogging(Logging.CHAT) || isLogging(Logging.PLAYER_COMMANDS) || isLogging(Logging.CONSOLE_COMMANDS) || isLogging(Logging.COMMANDBLOCK_COMMANDS)) { checkCharset("lb-chat", "message", st, true); } createIndexIfDoesNotExist("lb-materials", "name", "UNIQUE KEY `name` (`name`(150))", st, true); @@ -802,7 +802,7 @@ class Updater { if (!rs.next()) { state.execute("INSERT IGNORE INTO `lb-players` (UUID,playername) VALUES ('log_dummy_record','dummy_record')"); } - if (isLogging(Logging.CHAT)) { + if (isLogging(Logging.CHAT) || isLogging(Logging.PLAYER_COMMANDS) || isLogging(Logging.CONSOLE_COMMANDS) || isLogging(Logging.COMMANDBLOCK_COMMANDS)) { try { createTable(dbm, state, "lb-chat", "(id INT UNSIGNED NOT NULL AUTO_INCREMENT, date DATETIME NOT NULL, playerid INT UNSIGNED NOT NULL, message VARCHAR(256) NOT NULL, PRIMARY KEY (id), KEY playerid (playerid), FULLTEXT message (message)) DEFAULT CHARSET " + charset); } catch (SQLException e) {