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

clearlog for entities

Browse Source
This commit is contained in:
Brokkonaut
2018-11-10 04:22:52 +01:00
parent cd798e86de
commit 83157ad64f
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/de/diddiz/LogBlock/CommandsHandler.java
View File

@@ -569,7 +569,7 @@ public class CommandsHandler implements CommandExecutor {
file.getParentFile().mkdirs(); file.getParentFile().mkdirs();
int counter = 0; int counter = 0;
if (params.sum != SummarizationMode.NONE) { if (params.sum != SummarizationMode.NONE) {
writer.write("Created - Destroyed - " + (params.sum == SummarizationMode.TYPES ? "Block" : "Player") + newline); writer.write("Created - Destroyed - " + (params.sum == SummarizationMode.TYPES ? (params.bct == BlockChangeType.ENTITIES ? "Entity" : "Block") : "Player") + newline);
} }
final LookupCacheElementFactory factory = new LookupCacheElementFactory(params, sender instanceof Player ? 2 / 3f : 1); final LookupCacheElementFactory factory = new LookupCacheElementFactory(params, sender instanceof Player ? 2 / 3f : 1);
while (rs.next()) { while (rs.next()) {
@@ -855,6 +855,13 @@ public class CommandsHandler implements CommandExecutor {
tableBase = params.getTable(); tableBase = params.getTable();
deleteFromTables = "`" + tableBase + "-kills` "; deleteFromTables = "`" + tableBase + "-kills` ";
tableName = tableBase + "-kills"; tableName = tableBase + "-kills";
} else if (params.bct == BlockChangeType.ENTITIES || params.bct == BlockChangeType.ENTITIES_CREATED || params.bct == BlockChangeType.ENTITIES_KILLED) {
params.needType = true;
params.needCoords = true;
params.needData = true;
tableBase = params.getTable();
deleteFromTables = "`" + tableBase + "-entities` ";
tableName = tableBase + "-entities";
} else { } else {
params.needType = true; params.needType = true;
params.needCoords = true; params.needCoords = true;
@@ -906,6 +913,8 @@ public class CommandsHandler implements CommandExecutor {
sb.append(rs.getInt("y")).append(", "); sb.append(rs.getInt("y")).append(", ");
sb.append(rs.getInt("z")); sb.append(rs.getInt("z"));
sb.append(");\n"); sb.append(");\n");
} else if (params.bct == BlockChangeType.ENTITIES || params.bct == BlockChangeType.ENTITIES_CREATED || params.bct == BlockChangeType.ENTITIES_KILLED) {
} else { } else {
sb.append("INSERT INTO `").append(tableBase).append("-blocks` (`id`, `date`, `playerid`, `replaced`, `replacedData`, `type`, `typeData`, `x`, `y`, `z`) VALUES ("); sb.append("INSERT INTO `").append(tableBase).append("-blocks` (`id`, `date`, `playerid`, `replaced`, `replacedData`, `type`, `typeData`, `x`, `y`, `z`) VALUES (");
sb.append(rs.getInt("id")).append(", FROM_UNIXTIME("); sb.append(rs.getInt("id")).append(", FROM_UNIXTIME(");
@@ -952,6 +961,9 @@ public class CommandsHandler implements CommandExecutor {
} }
if (deleted > 0) { if (deleted > 0) {
state.executeUpdate("DELETE " + deleteFromTables + params.getFrom() + params.getWhere()); state.executeUpdate("DELETE " + deleteFromTables + params.getFrom() + params.getWhere());
if (params.bct == BlockChangeType.ENTITIES || params.bct == BlockChangeType.ENTITIES_CREATED || params.bct == BlockChangeType.ENTITIES_KILLED) {
state.executeUpdate("DELETE `" + tableBase + "-entityids` FROM `" + tableBase + "-entityids` LEFT JOIN `" + tableBase + "-entities` USING (entityid) WHERE `" + tableBase + "-entities`.entityid IS NULL");
}
} }
sender.sendMessage(ChatColor.GREEN + "Cleared out table " + tableName + ". Deleted " + deleted + " entries."); sender.sendMessage(ChatColor.GREEN + "Cleared out table " + tableName + ". Deleted " + deleted + " entries.");
} catch (final Exception ex) { } catch (final Exception ex) {

1
src/main/java/de/diddiz/LogBlock/config/Config.java
View File

@@ -91,6 +91,7 @@ public class Config {
for (final String world : worldNames) { for (final String world : worldNames) {
autoClearlog.add("world \"" + world + "\" before 365 days all"); autoClearlog.add("world \"" + world + "\" before 365 days all");
autoClearlog.add("world \"" + world + "\" player lavaflow waterflow leavesdecay before 7 days all"); autoClearlog.add("world \"" + world + "\" player lavaflow waterflow leavesdecay before 7 days all");
autoClearlog.add("world \"" + world + "\" entities before 365 days");
} }
def.put("clearlog.auto", autoClearlog); def.put("clearlog.auto", autoClearlog);
def.put("clearlog.autoClearLogDelay", "6h"); def.put("clearlog.autoClearLogDelay", "6h");