delegate minion team and alliedTo check to the lord player

TeamLapen · May 23, 2024 · de26ab0 · de26ab0
1 parent 71ddd20
commit de26ab0
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/src/main/java/de/teamlapen/vampirism/entity/minion/MinionEntity.java b/src/main/java/de/teamlapen/vampirism/entity/minion/MinionEntity.java
@@ -56,6 +56,7 @@
 import net.minecraft.world.item.UseAnim;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.scores.PlayerTeam;
 import net.neoforged.neoforge.entity.IEntityWithComplexSpawn;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.logging.log4j.LogManager;
@@ -228,6 +229,17 @@ public boolean doHurtTarget(Entity pEntity) {
         return flag;
     }
 
+    @Nullable
+    @Override
+    public PlayerTeam getTeam() {
+        return getLordOpt().map(s -> s.getPlayer().getTeam()).orElseGet(super::getTeam);
+    }
+
+    @Override
+    public boolean isAlliedTo(@NotNull Entity pEntity) {
+        return getLordOpt().map(s -> s.getPlayer() == pEntity).orElseGet(() -> super.isAlliedTo(pEntity));
+    }
+
     @NotNull
     @Override
     public ItemStack eat(@NotNull Level world, @NotNull ItemStack stack) {