From 05e82be19ee915a42ada1d69e12c4de55590562f Mon Sep 17 00:00:00 2001 From: OnyxDarkKnight Date: Thu, 2 Jul 2015 00:04:40 +0100 Subject: Fixed a major issue with Curses and possibly Hearts --- src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java') diff --git a/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java b/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java index 26f6d2e..aa8f5c8 100644 --- a/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java +++ b/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java @@ -72,8 +72,9 @@ public class EntityHeart extends EntityLiving { playerInfo.setFloat(getType() + "Heart", 0F); player.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(player.getMaxHealth() + playerInfo.getFloat("WhiteHeart")); this.setDead(); - } else if (getType().equals("Black") || getType().equals("Blue")) { - playerInfo.setFloat(getType() + "Heart", playerInfo.getFloat(getType() + "Heart") + getQuantity()); + } else if (!getType().equals("Red")) { + if(playerInfo.hasKey(getType() + "Heart")) playerInfo.setFloat(getType() + "Heart", playerInfo.getFloat(getType() + "Heart") + getQuantity()); + else playerInfo.setFloat(getType() + "Heart", getQuantity()); JewelrycraftMod.netWrapper.sendToServer(new PacketRequestPlayerInfo()); this.setDead(); } -- cgit v1.2.3