diff --git a/src/main/java/appeng/entity/SingularityEntity.java b/src/main/java/appeng/entity/SingularityEntity.java index 0e11c14b5..3e04617a2 100644 --- a/src/main/java/appeng/entity/SingularityEntity.java +++ b/src/main/java/appeng/entity/SingularityEntity.java @@ -27,6 +27,7 @@ import net.minecraft.entity.item.ItemEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.DamageSource; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; @@ -38,6 +39,8 @@ import appeng.util.Platform; public final class SingularityEntity extends AEBaseItemEntity { + private static final ResourceLocation TAG_ENDER_PEARL = new ResourceLocation("forge:ender_pearls"); + public static EntityType TYPE; private static int randTickSeed = 0; @@ -84,6 +87,18 @@ public final class SingularityEntity extends AEBaseItemEntity { if (!other.isEmpty()) { boolean matches = false; + if (materials.enderDust().isSameAs(other)) { + matches = true; + } + + // check... other name. + if( !matches ) + { + if (other.getItem().getTags().contains(TAG_ENDER_PEARL)) { + matches = true; + } + } + if (matches) { while (item.getCount() > 0 && other.getCount() > 0) { other.grow(-1);