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

Animals should not contain ambient entities

Browse Source
This commit is contained in:
Brokkonaut
2018-11-09 06:27:21 +01:00
parent 76aeb5f602
commit 9ea7a47b4e
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/diddiz/LogBlock/EntityLogging.java → src/main/java/de/diddiz/LogBlock/config/EntityLogging.java
View File

@ -1,4 +1,4 @@
package de.diddiz.LogBlock; package de.diddiz.LogBlock.config;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;

4
src/main/java/de/diddiz/LogBlock/config/WorldConfig.java
View File

@ -1,12 +1,10 @@
package de.diddiz.LogBlock.config; package de.diddiz.LogBlock.config;
import de.diddiz.LogBlock.EntityLogging;
import de.diddiz.LogBlock.LogBlock; import de.diddiz.LogBlock.LogBlock;
import de.diddiz.LogBlock.Logging; import de.diddiz.LogBlock.Logging;
import de.diddiz.util.BukkitUtils; import de.diddiz.util.BukkitUtils;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Ambient;
import org.bukkit.entity.Animals; import org.bukkit.entity.Animals;
import org.bukkit.entity.ArmorStand; import org.bukkit.entity.ArmorStand;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
@ -124,7 +122,7 @@ public class WorldConfig extends LoggingEnabledMapping {
if (logLiving && LivingEntity.class.isAssignableFrom(entity.getClass()) && !(entity instanceof ArmorStand)) { if (logLiving && LivingEntity.class.isAssignableFrom(entity.getClass()) && !(entity instanceof ArmorStand)) {
return true; 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; 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)) { 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)) {

2
src/main/java/de/diddiz/LogBlock/listeners/AdvancedEntityLogging.java
View File

@ -34,9 +34,9 @@ import org.bukkit.scheduler.BukkitRunnable;
import de.diddiz.LogBlock.Actor; import de.diddiz.LogBlock.Actor;
import de.diddiz.LogBlock.EntityChange; import de.diddiz.LogBlock.EntityChange;
import de.diddiz.LogBlock.EntityLogging;
import de.diddiz.LogBlock.LogBlock; import de.diddiz.LogBlock.LogBlock;
import de.diddiz.LogBlock.config.Config; import de.diddiz.LogBlock.config.Config;
import de.diddiz.LogBlock.config.EntityLogging;
import de.diddiz.worldedit.WorldEditHelper; import de.diddiz.worldedit.WorldEditHelper;
public class AdvancedEntityLogging extends LoggingListener { public class AdvancedEntityLogging extends LoggingListener {