visibility conditions

Author: Malfrador

src/main/java/de/erethon/aether/creature/AetherBaseMob.java

@@ -42,11 +42,13 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerEntity;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.util.Mth;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
+import net.minecraft.world.damagesource.CombatTracker;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.Display;
 import net.minecraft.world.entity.Entity;
@@ -107,7 +109,7 @@ public class AetherBaseMob extends Monster implements RangedAttackMob, CrossbowA
     protected EntityType<?> displayType;
     private int version = 0;
     protected CraftCustomMob bukkitLivingEntity;
-    private AetherHolder holder;
+    public AetherHolder holder;
     private String mobTag = null;
 
     protected int mobLevel = 1;
@@ -145,6 +147,10 @@ public AetherBaseMob(NPCData data, World world, Integer overrideLevel) {
         version = data.getCurrentVersion();
         onLoad();
         onFirstSpawn();
+        if (!holder.checkSpawnConditions()) {
+            remove(Entity.RemovalReason.DISCARDED);
+            return;
+        }
     }
 
     public void addToWorld() {

src/main/java/de/erethon/aether/listener/EntityListener.java

@@ -6,11 +6,13 @@
 import de.erethon.papyrus.entities.CraftCustomMob;
 import de.erethon.spellbook.api.SpellEffectAddEvent;
 import io.papermc.paper.event.entity.EntityKnockbackEvent;
+import io.papermc.paper.event.player.PlayerTrackEntityEvent;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
 
 public class EntityListener implements Listener {
@@ -54,4 +56,11 @@ public void onEntityDamage(EntityKnockbackByEntityEvent event) {
         }
     }
 
+    @EventHandler
+    public void onTrackingStart(PlayerTrackEntityEvent event) {
+        if (event.getEntity() instanceof CraftCustomMob mob && mob.getHandle() instanceof AetherBaseMob aetherMob) {
+            event.setCancelled(!aetherMob.holder.checkVisibilityConditions(event.getPlayer()));
+        }
+    }
+
 }

src/main/java/de/erethon/aether/qxl/AetherHolder.java

@@ -7,9 +7,12 @@
 import de.erethon.questsxl.common.QConfigLoader;
 import de.erethon.questsxl.common.QRegistries;
 import de.erethon.questsxl.common.Quester;
+import de.erethon.questsxl.condition.QCondition;
 import de.erethon.questsxl.error.FriendlyError;
+import de.erethon.questsxl.player.QPlayer;
 import org.bukkit.Location;
 import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.entity.Player;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -18,13 +21,37 @@ public class AetherHolder implements QComponent, Quester {
 
     private AetherBaseMob mob;
 
+    private Set<QCondition> visibilityConditions = new HashSet<>();
+    private Set<QCondition> spawnConditions = new HashSet<>();
     private Set<QAction> rightClickActions = new HashSet<>();
     private Set<QAction> leftClickActions = new HashSet<>();
     private Set<QAction> deathActions = new HashSet<>();
     private Set<QAction> spawnActions = new HashSet<>();
     private Set<QAction> damageActions = new HashSet<>();
     private Set<QAction> attackActions = new HashSet<>();
 
+    public boolean checkVisibilityConditions(Player player) {
+        QPlayer qPlayer = QuestsXL.get().getDatabaseManager().getCurrentPlayer(player);
+        if (qPlayer == null) {
+            return false;
+        }
+        for (QCondition condition : visibilityConditions) {
+            if (!condition.check(qPlayer)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean checkSpawnConditions() {
+        for (QCondition condition : spawnConditions) {
+            if (!condition.check(this)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     public void onDeath() {
         if (deathActions == null || deathActions.isEmpty()) {
             return;
@@ -123,6 +150,8 @@ public static AetherHolder loadFromConfigSection(ConfigurationSection section, A
         String mobID = mob.getData().getID();
         holder.mob = mob;
         try {
+            holder.visibilityConditions = (Set<QCondition>) QConfigLoader.load(holder, "visibilityConditions", section, QRegistries.CONDITIONS);
+            holder.spawnConditions = (Set<QCondition>) QConfigLoader.load(holder, "spawnConditions", section, QRegistries.CONDITIONS);
             holder.rightClickActions = (Set<QAction>) QConfigLoader.load(holder, "rightClickActions", section, QRegistries.ACTIONS);
             holder.leftClickActions = (Set<QAction>) QConfigLoader.load(holder, "leftClickActions", section, QRegistries.ACTIONS);
             holder.deathActions = (Set<QAction>) QConfigLoader.load(holder, "deathActions", section, QRegistries.ACTIONS);