diff --git a/src/main/java/tconstruct/armor/TinkerArmorEvents.java b/src/main/java/tconstruct/armor/TinkerArmorEvents.java
index d6caf96d..50b6a8d4 100644
--- a/src/main/java/tconstruct/armor/TinkerArmorEvents.java
+++ b/src/main/java/tconstruct/armor/TinkerArmorEvents.java
@@ -26,6 +26,14 @@ public class TinkerArmorEvents
             return;
 
         if (TConstruct.random.nextInt(200) == 0 && event.entityLiving instanceof IMob && event.source.damageType.equals("player"))
+        {
+            ItemStack dropStack = new ItemStack(TinkerArmor.heartCanister, 1, 1);
+            EntityItem entityitem = new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, dropStack);
+            entityitem.delayBeforeCanPickup = 10;
+            event.drops.add(entityitem);
+        }
+
+        if (event.entityLiving instanceof IBossDisplayData)
         {
             if (event.entityLiving instanceof BlueSlime)
             {
@@ -33,23 +41,19 @@ public class TinkerArmorEvents
                 if (slime.getSlimeSize() < 8)
                     return;
             }
+            String entityName = event.entityLiving.getClass().getSimpleName().toLowerCase();
+            if (entityName.contains("entitynpc"))
+                return;
+
             int count = event.entityLiving instanceof EntityDragon ? 5 : 1;
             for (int i = 0; i < count; i++)
             {
-                ItemStack dropStack = new ItemStack(TinkerArmor.heartCanister, 1, 1);
+                ItemStack dropStack = new ItemStack(TinkerArmor.heartCanister, 1, 3);
                 EntityItem entityitem = new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, dropStack);
                 entityitem.delayBeforeCanPickup = 10;
                 event.drops.add(entityitem);
             }
         }
-
-        if (event.entityLiving instanceof IBossDisplayData)
-        {
-            ItemStack dropStack = new ItemStack(TinkerArmor.heartCanister, 1, 3);
-            EntityItem entityitem = new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, dropStack);
-            entityitem.delayBeforeCanPickup = 10;
-            event.drops.add(entityitem);
-        }
     }
 
     /* Abilities */