feedc0de/LogBlock
1
0
Fork 0
forked from LogBlock/LogBlock
Code Pull Requests Activity

create tables and register events if logging commands

Browse Source
This commit is contained in:
Brokkonaut
2020-01-26 06:27:09 +01:00
parent 8eb93411ec
commit 1dba9f20f1
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/diddiz/LogBlock/LogBlock.java
View File

@@ -175,7 +175,7 @@ public class LogBlock extends JavaPlugin {
if (isLogging(Logging.KILL)) { if (isLogging(Logging.KILL)) {
pm.registerEvents(new KillLogging(this), this); 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); pm.registerEvents(new ChatLogging(this), this);
} }
if (isLogging(Logging.ENDERMEN)) { if (isLogging(Logging.ENDERMEN)) {

2
src/main/java/de/diddiz/LogBlock/QueryParams.java
View File

@@ -975,7 +975,7 @@ public final class QueryParams implements Cloneable {
} }
} }
if (bct == BlockChangeType.CHAT) { 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"); throw new IllegalArgumentException("Chat is not logged");
} }
if (sum != SummarizationMode.NONE) { if (sum != SummarizationMode.NONE) {

10
src/main/java/de/diddiz/LogBlock/Updater.java
View File

@@ -47,7 +47,7 @@ class Updater {
// } // }
if (configVersion.compareTo(new ComparableVersion("1.2.7")) < 0) { if (configVersion.compareTo(new ComparableVersion("1.2.7")) < 0) {
logblock.getLogger().info("Updating tables to 1.2.7 ..."); 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(); final Connection conn = logblock.getConnection();
try { try {
conn.setAutoCommit(true); conn.setAutoCommit(true);
@@ -376,7 +376,7 @@ class Updater {
conn.setAutoCommit(true); conn.setAutoCommit(true);
final Statement st = conn.createStatement(); final Statement st = conn.createStatement();
checkCharset("lb-players", "name", st, false); 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); checkCharset("lb-chat", "message", st, false);
} }
for (final WorldConfig wcfg : getLoggedWorlds()) { for (final WorldConfig wcfg : getLoggedWorlds()) {
@@ -395,7 +395,7 @@ class Updater {
if (configVersion.compareTo(new ComparableVersion("1.12.0")) < 0) { if (configVersion.compareTo(new ComparableVersion("1.12.0")) < 0) {
logblock.getLogger().info("Updating tables to 1.12.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(); final Connection conn = logblock.getConnection();
try { try {
conn.setAutoCommit(true); conn.setAutoCommit(true);
@@ -739,7 +739,7 @@ class Updater {
conn.setAutoCommit(true); conn.setAutoCommit(true);
final Statement st = conn.createStatement(); final Statement st = conn.createStatement();
checkCharset("lb-players", "name", st, true); 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); checkCharset("lb-chat", "message", st, true);
} }
createIndexIfDoesNotExist("lb-materials", "name", "UNIQUE KEY `name` (`name`(150))", st, true); createIndexIfDoesNotExist("lb-materials", "name", "UNIQUE KEY `name` (`name`(150))", st, true);
@@ -802,7 +802,7 @@ class Updater {
if (!rs.next()) { if (!rs.next()) {
state.execute("INSERT IGNORE INTO `lb-players` (UUID,playername) VALUES ('log_dummy_record','dummy_record')"); 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 { 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); 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) { } catch (SQLException e) {