summaryrefslogtreecommitdiff
path: root/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java
diff options
context:
space:
mode:
authorOnyxDarkKnight <sor1n.iliutza16@gmail.com>2015-07-02 00:04:40 +0100
committerOnyxDarkKnight <sor1n.iliutza16@gmail.com>2015-07-02 00:04:40 +0100
commit05e82be19ee915a42ada1d69e12c4de55590562f (patch)
treef803d8c0aceae6732c2c2ff0d994099718fb6b8a /src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java
parent5ae9fc6d513ca331ea246a8b2b2134a450708733 (diff)
Fixed a major issue with Curses and possibly Hearts
Diffstat (limited to 'src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java')
-rw-r--r--src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java5
1 files changed, 3 insertions, 2 deletions
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();
}