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

separate logging option for wateranimals

Browse Source
This commit is contained in:
Brokkonaut
2022-11-03 05:41:41 +01:00
parent 0f459440be
commit 4faced94d4
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,10 +96,11 @@ public class WorldConfig extends LoggingEnabledMapping {
} }
private class EntityLoggingList { private class EntityLoggingList {
private EntityLogging entityAction; private final EntityLogging entityAction;
private final EnumSet<EntityType> logged = EnumSet.noneOf(EntityType.class); private final EnumSet<EntityType> logged = EnumSet.noneOf(EntityType.class);
private final boolean logAll; private final boolean logAll;
private final boolean logAnimals; private final boolean logAnimals;
private final boolean logWateranimals;
private final boolean logMonsters; private final boolean logMonsters;
private final boolean logLiving; private final boolean logLiving;
@ -107,6 +108,7 @@ public class WorldConfig extends LoggingEnabledMapping {
this.entityAction = entityAction; this.entityAction = entityAction;
boolean all = false; boolean all = false;
boolean animals = false; boolean animals = false;
boolean wateranimals = false;
boolean monsters = false; boolean monsters = false;
boolean living = false; boolean living = false;
for (String type : types) { for (String type : types) {
@ -118,6 +120,8 @@ public class WorldConfig extends LoggingEnabledMapping {
all = true; all = true;
} else if (type.equalsIgnoreCase("animal") || type.equalsIgnoreCase("animals")) { } else if (type.equalsIgnoreCase("animal") || type.equalsIgnoreCase("animals")) {
animals = true; animals = true;
} else if (type.equalsIgnoreCase("wateranimal") || type.equalsIgnoreCase("wateranimals")) {
wateranimals = true;
} else if (type.equalsIgnoreCase("monster") || type.equalsIgnoreCase("monsters")) { } else if (type.equalsIgnoreCase("monster") || type.equalsIgnoreCase("monsters")) {
monsters = true; monsters = true;
} else if (type.equalsIgnoreCase("living")) { } else if (type.equalsIgnoreCase("living")) {
@ -129,6 +133,7 @@ public class WorldConfig extends LoggingEnabledMapping {
} }
logAll = all; logAll = all;
logAnimals = animals; logAnimals = animals;
logWateranimals = wateranimals;
logMonsters = monsters; logMonsters = monsters;
logLiving = living; logLiving = living;
} }
@ -144,7 +149,10 @@ 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()))) { if (logAnimals && Animals.class.isAssignableFrom(entity.getClass())) {
return true;
}
if (logWateranimals && 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)) {