Merge pull request #396 from Team-EnderIO/fix/soul-vial-bosses

Team-EnderIO · Jul 30, 2023 · f3947cc · f3947cc
2 parents ddb7bb7 + 2be26fe
commit f3947cc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/src/generated/resources/data/enderio/tags/entity_types/soul_vial_blacklist.json b/src/generated/resources/data/enderio/tags/entity_types/soul_vial_blacklist.json
@@ -1,5 +1,3 @@
 {
-  "values": [
-    "#forge:bosses"
-  ]
+  "values": []
 }
diff --git a/src/main/java/com/enderio/base/common/util/EntityCaptureUtils.java b/src/main/java/com/enderio/base/common/util/EntityCaptureUtils.java
@@ -10,6 +10,7 @@
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.ai.attributes.DefaultAttributes;
+import net.minecraftforge.common.Tags;
 import net.minecraftforge.registries.ForgeRegistries;
 import org.jetbrains.annotations.Nullable;
 
@@ -87,10 +88,6 @@ public static CapturableStatus getCapturableStatus(EntityType<? extends LivingEn
     }
 
     public static boolean isBlacklistedBoss(Entity entity) {
-        return EntityUtil.getEntityTypeRL(entity)
-            .map(resourceLocation ->
-                EntityUtil.isBoss(entity)
-                && !"minecraft".equals(resourceLocation.getNamespace()))
-            .orElse(false);
+        return entity.getType().is(Tags.EntityTypes.BOSSES);
     }
 }
diff --git a/src/main/java/com/enderio/base/data/tags/EIOEntityTagsProvider.java b/src/main/java/com/enderio/base/data/tags/EIOEntityTagsProvider.java
@@ -18,6 +18,6 @@ public EIOEntityTagsProvider(PackOutput packOutput, CompletableFuture<HolderLook
 
     @Override
     protected void addTags(HolderLookup.Provider pProvider) {
-        this.tag(EIOTags.EntityTypes.SOUL_VIAL_BLACKLIST).addTag(Tags.EntityTypes.BOSSES);
+        this.tag(EIOTags.EntityTypes.SOUL_VIAL_BLACKLIST);
     }
 }