From 597b1831f198e5ec2946facd6741533c109247a8 Mon Sep 17 00:00:00 2001
From: Brokkonaut <hannos17@gmx.de>
Date: Thu, 26 Aug 2021 20:53:42 +0200
Subject: [PATCH] Normalize actor for crop trampling mobs

---
 src/main/java/de/diddiz/LogBlock/Actor.java                | 1 +
 .../diddiz/LogBlock/listeners/CreatureInteractLogging.java | 7 ++-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/java/de/diddiz/LogBlock/Actor.java b/src/main/java/de/diddiz/LogBlock/Actor.java
index d222589..1b48b25 100644
--- a/src/main/java/de/diddiz/LogBlock/Actor.java
+++ b/src/main/java/de/diddiz/LogBlock/Actor.java
@@ -95,6 +95,7 @@ public class Actor {
         return new Actor(entityName(entity));
     }
 
+    @Deprecated
     public static Actor actorFromEntity(EntityType entity) {
         return new Actor(entity.name());
     }
diff --git a/src/main/java/de/diddiz/LogBlock/listeners/CreatureInteractLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/CreatureInteractLogging.java
index f831d84..84651b2 100644
--- a/src/main/java/de/diddiz/LogBlock/listeners/CreatureInteractLogging.java
+++ b/src/main/java/de/diddiz/LogBlock/listeners/CreatureInteractLogging.java
@@ -10,7 +10,6 @@ import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.data.type.TurtleEgg;
-import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -27,10 +26,8 @@ public class CreatureInteractLogging extends LoggingListener {
     public void onEntityInteract(EntityInteractEvent event) {
         final WorldConfig wcfg = getWorldConfig(event.getEntity().getWorld());
 
-        final EntityType entityType = event.getEntityType();
-
         // Mobs only
-        if (event.getEntity() instanceof Player || entityType == null) {
+        if (event.getEntity() instanceof Player) {
             return;
         }
 
@@ -42,7 +39,7 @@ public class CreatureInteractLogging extends LoggingListener {
             if (type == Material.FARMLAND) {
                 if (wcfg.isLogging(Logging.CREATURECROPTRAMPLE)) {
                     // 3 = Dirt ID
-                    consumer.queueBlock(Actor.actorFromEntity(entityType), loc, type.createBlockData(), Material.DIRT.createBlockData());
+                    consumer.queueBlock(new Actor("CreatureTrample"), loc, type.createBlockData(), Material.DIRT.createBlockData());
                     // Log the crop on top as being broken
                     Block trampledCrop = clicked.getRelative(BlockFace.UP);
                     if (BukkitUtils.getCropBlocks().contains(trampledCrop.getType())) {