Merge branch '1.7.10' of https://github.com/sor1n/Modjam-Mod.git into 1.7.10

Conflicts:
	build.gradle

1 files changed, 2 insertions, 2 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java
index d6f60ae..c3b35a9 100644
--- a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java
+++ b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java
@@ -227,7 +227,7 @@ public class EntityEventHandler {
 			else if (playerInfo.getFloat("BlackHeart") > 0) {

 				AxisAlignedBB axisalignedbb = player.boundingBox.expand(3.0D, 0.0D, 3.0D);

 				List enemies = player.worldObj.getEntitiesWithinAABBExcludingEntity(player, axisalignedbb);

-				if (enemies != null && !enemies.isEmpty()) {

+				if (enemies != null && !enemies.isEmpty() && event.source != DamageSourceList.blackHeart) {

 					Iterator iterator = enemies.iterator();

 					while (iterator.hasNext()) {

 						Entity enemy = (Entity) iterator.next();

@@ -374,4 +374,4 @@ public class EntityEventHandler {
 		}

 		if (event.entity instanceof EntityPlayer && !(event.entity instanceof EntityPlayerMP)) JewelrycraftMod.netWrapper.sendToServer(new PacketRequestPlayerInfo());

 	}

-}
\ No newline at end of file
+}