From 9d08d6c58a0622d31494d612d5b401a1fed186df Mon Sep 17 00:00:00 2001 From: OnyxDarkKnight Date: Fri, 8 May 2015 18:12:00 +0100 Subject: Fixed a few things as well as working towards having the ability to translate everything --- .../jewelrycraft/entities/EntityHalfHeart.java | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/entities/EntityHalfHeart.java') 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); } } -- cgit v1.2.3