From 83157ad64f5b20233fe624c73773d5a2a3b94c56 Mon Sep 17 00:00:00 2001
From: Brokkonaut <hannos17@gmx.de>
Date: Sat, 10 Nov 2018 04:22:52 +0100
Subject: [PATCH] clearlog for entities

---
 .../java/de/diddiz/LogBlock/CommandsHandler.java   | 14 +++++++++++++-
 .../java/de/diddiz/LogBlock/config/Config.java     |  1 +
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/java/de/diddiz/LogBlock/CommandsHandler.java b/src/main/java/de/diddiz/LogBlock/CommandsHandler.java
index 7fd5f9c..c19f565 100755
--- a/src/main/java/de/diddiz/LogBlock/CommandsHandler.java
+++ b/src/main/java/de/diddiz/LogBlock/CommandsHandler.java
@@ -569,7 +569,7 @@ public class CommandsHandler implements CommandExecutor {
                 file.getParentFile().mkdirs();
                 int counter = 0;
                 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);
                 while (rs.next()) {
@@ -855,6 +855,13 @@ public class CommandsHandler implements CommandExecutor {
                     tableBase = params.getTable();
                     deleteFromTables = "`" + 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 {
                     params.needType = true;
                     params.needCoords = true;
@@ -906,6 +913,8 @@ public class CommandsHandler implements CommandExecutor {
                                     sb.append(rs.getInt("y")).append(", ");
                                     sb.append(rs.getInt("z"));
                                     sb.append(");\n");
+                                } else if (params.bct == BlockChangeType.ENTITIES || params.bct == BlockChangeType.ENTITIES_CREATED || params.bct == BlockChangeType.ENTITIES_KILLED) {
+                                    
                                 } else {
                                     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(");
@@ -952,6 +961,9 @@ public class CommandsHandler implements CommandExecutor {
                 }
                 if (deleted > 0) {
                     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.");
             } catch (final Exception ex) {
diff --git a/src/main/java/de/diddiz/LogBlock/config/Config.java b/src/main/java/de/diddiz/LogBlock/config/Config.java
index 9fb8429..c054383 100644
--- a/src/main/java/de/diddiz/LogBlock/config/Config.java
+++ b/src/main/java/de/diddiz/LogBlock/config/Config.java
@@ -91,6 +91,7 @@ public class Config {
         for (final String world : worldNames) {
             autoClearlog.add("world \"" + world + "\" before 365 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.autoClearLogDelay", "6h");