Fixed a few things as well as working towards having the ability to translate everything

1 files changed, 7 insertions, 15 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/entities/EntityHalfHeart.java b/src/main/java/darkknight/jewelrycraft/entities/EntityHalfHeart.java
index 4fad309..c538f86 100644
--- a/src/main/java/darkknight/jewelrycraft/entities/EntityHalfHeart.java
+++ b/src/main/java/darkknight/jewelrycraft/entities/EntityHalfHeart.java
@@ -24,23 +24,15 @@ public class EntityHalfHeart extends EntityHeart
         super(world);
     }
     
+    protected void entityInit()
+    {
+        super.entityInit();
+        this.dataWatcher.updateObject(17, 1f);
+    }
+    
     @Override
     public void onCollideWithPlayer(EntityPlayer player)
     {
-        if (!player.worldObj.isRemote){
-            NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);
-            if (getType().equals("Red") && player.getHealth() < player.getMaxHealth()){
-                player.heal(1f);
-                this.setDead();
-            }else if (getType().equals("White") && playerInfo.getFloat("WhiteHeart") > 0.1F){
-                playerInfo.setFloat(getType() + "Heart", 0F);
-                player.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(player.getMaxHealth() + 2f);
-                this.setDead();
-            }else if (!getType().equals("Red")){
-                playerInfo.setFloat(getType() + "Heart", playerInfo.getFloat(getType() + "Heart") + 1.0F);
-                this.setDead();
-            }
-        }
-        else JewelrycraftMod.netWrapper.sendToServer(new PacketRequestPlayerInfo());
+        super.onCollideWithPlayer(player);
     }
 }