From 05d7652bccc967d0a08c758376d398cede4b19c8 Mon Sep 17 00:00:00 2001
From: Brokkonaut <hannos17@gmx.de>
Date: Fri, 31 May 2019 18:00:55 +0200
Subject: [PATCH] Improve log messages when the block/entity type is unknown

---
 .../java/de/diddiz/LogBlock/BlockChange.java  | 17 +++---
 .../java/de/diddiz/LogBlock/EntityChange.java | 52 ++++++++++---------
 2 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/src/main/java/de/diddiz/LogBlock/BlockChange.java b/src/main/java/de/diddiz/LogBlock/BlockChange.java
index 450f7fd..64b4d53 100644
--- a/src/main/java/de/diddiz/LogBlock/BlockChange.java
+++ b/src/main/java/de/diddiz/LogBlock/BlockChange.java
@@ -73,10 +73,18 @@ public class BlockChange implements LookupCacheElement {
 
     @Override
     public String toString() {
+        final StringBuilder msg = new StringBuilder();
+        if (date > 0) {
+            msg.append(Config.formatter.format(date)).append(" ");
+        }
+        if (actor != null) {
+            msg.append(actor.getName()).append(" ");
+        }
         BlockData type = getBlockSet();
         BlockData replaced = getBlockReplaced();
         if (type == null || replaced == null) {
-            return "Unknown block modification";
+            msg.append("did an unknown block modification");
+            return msg.toString();
         }
         String typeDetails = null;
         if (BlockStateCodecs.hasCodec(type.getMaterial())) {
@@ -104,13 +112,6 @@ public class BlockChange implements LookupCacheElement {
         } else {
             replacedDetails = " " + replacedDetails;
         }
-        final StringBuilder msg = new StringBuilder();
-        if (date > 0) {
-            msg.append(Config.formatter.format(date)).append(" ");
-        }
-        if (actor != null) {
-            msg.append(actor.getName()).append(" ");
-        }
         if (type.getMaterial().equals(replaced.getMaterial())) {
             if (BukkitUtils.isEmpty(type.getMaterial())) {
                 msg.append("did an unspecified action");
diff --git a/src/main/java/de/diddiz/LogBlock/EntityChange.java b/src/main/java/de/diddiz/LogBlock/EntityChange.java
index 90c389b..b005692 100644
--- a/src/main/java/de/diddiz/LogBlock/EntityChange.java
+++ b/src/main/java/de/diddiz/LogBlock/EntityChange.java
@@ -71,32 +71,36 @@ public class EntityChange implements LookupCacheElement {
         if (actor != null) {
             msg.append(actor.getName()).append(" ");
         }
-        if (type != null) {
-            boolean living = LivingEntity.class.isAssignableFrom(type.getEntityClass()) && !ArmorStand.class.isAssignableFrom(type.getDeclaringClass());
-            if (changeType == EntityChangeType.CREATE) {
-                msg.append("created ");
-            } else if (changeType == EntityChangeType.KILL) {
-                msg.append(living ? "killed " : "destroyed ");
-            } else if (changeType == EntityChangeType.ADDEQUIP) {
-                YamlConfiguration conf = Utils.deserializeYamlConfiguration(data);
-                ItemStack stack = conf == null ? null : conf.getItemStack("item");
-                if (stack == null) {
-                    msg.append("added an item to ");
-                } else {
-                    msg.append("added " + stack.getType() + " to ");
-                }
-            } else if (changeType == EntityChangeType.REMOVEEQUIP) {
-                YamlConfiguration conf = Utils.deserializeYamlConfiguration(data);
-                ItemStack stack = conf == null ? null : conf.getItemStack("item");
-                if (stack == null) {
-                    msg.append("removed an item from ");
-                } else {
-                    msg.append("removed " + stack.getType() + " from ");
-                }
-            } else if (changeType == EntityChangeType.MODIFY) {
-                msg.append("modified ");
+        if (changeType == EntityChangeType.CREATE) {
+            msg.append("created ");
+        } else if (changeType == EntityChangeType.KILL) {
+            boolean living = type != null && LivingEntity.class.isAssignableFrom(type.getEntityClass()) && !ArmorStand.class.isAssignableFrom(type.getDeclaringClass());
+            msg.append(living ? "killed " : "destroyed ");
+        } else if (changeType == EntityChangeType.ADDEQUIP) {
+            YamlConfiguration conf = Utils.deserializeYamlConfiguration(data);
+            ItemStack stack = conf == null ? null : conf.getItemStack("item");
+            if (stack == null) {
+                msg.append("added an item to ");
+            } else {
+                msg.append("added " + stack.getType() + " to ");
             }
+        } else if (changeType == EntityChangeType.REMOVEEQUIP) {
+            YamlConfiguration conf = Utils.deserializeYamlConfiguration(data);
+            ItemStack stack = conf == null ? null : conf.getItemStack("item");
+            if (stack == null) {
+                msg.append("removed an item from ");
+            } else {
+                msg.append("removed " + stack.getType() + " from ");
+            }
+        } else if (changeType == EntityChangeType.MODIFY) {
+            msg.append("modified ");
+        } else {
+            msg.append("did an unknown action to ");
+        }
+        if (type != null) {
             msg.append(type.name());
+        } else {
+            msg.append("an unknown entity");
         }
         if (loc != null) {
             msg.append(" at ").append(loc.getBlockX()).append(":").append(loc.getBlockY()).append(":").append(loc.getBlockZ());