From 9ea7a47b4eeeebe76b5917fe6217d4d76741b30b Mon Sep 17 00:00:00 2001
From: Brokkonaut <hannos17@gmx.de>
Date: Fri, 9 Nov 2018 06:27:21 +0100
Subject: [PATCH] Animals should not contain ambient entities

---
 .../java/de/diddiz/LogBlock/{ => config}/EntityLogging.java   | 2 +-
 src/main/java/de/diddiz/LogBlock/config/WorldConfig.java      | 4 +---
 .../de/diddiz/LogBlock/listeners/AdvancedEntityLogging.java   | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)
 rename src/main/java/de/diddiz/LogBlock/{ => config}/EntityLogging.java (96%)

diff --git a/src/main/java/de/diddiz/LogBlock/EntityLogging.java b/src/main/java/de/diddiz/LogBlock/config/EntityLogging.java
similarity index 96%
rename from src/main/java/de/diddiz/LogBlock/EntityLogging.java
rename to src/main/java/de/diddiz/LogBlock/config/EntityLogging.java
index 80c3878..8e1e75a 100644
--- a/src/main/java/de/diddiz/LogBlock/EntityLogging.java
+++ b/src/main/java/de/diddiz/LogBlock/config/EntityLogging.java
@@ -1,4 +1,4 @@
-package de.diddiz.LogBlock;
+package de.diddiz.LogBlock.config;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/src/main/java/de/diddiz/LogBlock/config/WorldConfig.java b/src/main/java/de/diddiz/LogBlock/config/WorldConfig.java
index ca6d9b8..de2bb4a 100644
--- a/src/main/java/de/diddiz/LogBlock/config/WorldConfig.java
+++ b/src/main/java/de/diddiz/LogBlock/config/WorldConfig.java
@@ -1,12 +1,10 @@
 package de.diddiz.LogBlock.config;
 
-import de.diddiz.LogBlock.EntityLogging;
 import de.diddiz.LogBlock.LogBlock;
 import de.diddiz.LogBlock.Logging;
 import de.diddiz.util.BukkitUtils;
 
 import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Ambient;
 import org.bukkit.entity.Animals;
 import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Entity;
@@ -124,7 +122,7 @@ public class WorldConfig extends LoggingEnabledMapping {
             if (logLiving && LivingEntity.class.isAssignableFrom(entity.getClass()) && !(entity instanceof ArmorStand)) {
                 return true;
             }
-            if (logAnimals && (Animals.class.isAssignableFrom(entity.getClass()) || WaterMob.class.isAssignableFrom(entity.getClass()) || Ambient.class.isAssignableFrom(entity.getClass()))) {
+            if (logAnimals && (Animals.class.isAssignableFrom(entity.getClass()) || WaterMob.class.isAssignableFrom(entity.getClass()))) {
                 return true;
             }
             if (logMonsters && (Monster.class.isAssignableFrom(entity.getClass()) || entity.getType() == EntityType.SLIME || entity.getType() == EntityType.WITHER || entity.getType() == EntityType.ENDER_DRAGON || entity.getType() == EntityType.SHULKER || entity.getType() == EntityType.GHAST)) {
diff --git a/src/main/java/de/diddiz/LogBlock/listeners/AdvancedEntityLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/AdvancedEntityLogging.java
index 52997fd..7b56a97 100644
--- a/src/main/java/de/diddiz/LogBlock/listeners/AdvancedEntityLogging.java
+++ b/src/main/java/de/diddiz/LogBlock/listeners/AdvancedEntityLogging.java
@@ -34,9 +34,9 @@ import org.bukkit.scheduler.BukkitRunnable;
 
 import de.diddiz.LogBlock.Actor;
 import de.diddiz.LogBlock.EntityChange;
-import de.diddiz.LogBlock.EntityLogging;
 import de.diddiz.LogBlock.LogBlock;
 import de.diddiz.LogBlock.config.Config;
+import de.diddiz.LogBlock.config.EntityLogging;
 import de.diddiz.worldedit.WorldEditHelper;
 
 public class AdvancedEntityLogging extends LoggingListener {