diff options
| author | OnyxDarkKnight <sor1n.iliutza16@gmail.com> | 2015-09-01 18:36:17 +0100 |
|---|---|---|
| committer | OnyxDarkKnight <sor1n.iliutza16@gmail.com> | 2015-09-01 18:36:17 +0100 |
| commit | 13f491acee3dfd675bf77a666722b2518dd54ab2 (patch) | |
| tree | a9a0a8e4bf0fd82af5d9f13db89d9307f1e35f13 /src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java | |
| parent | b1ee29a247058b5686ee13093c46659ac3f01685 (diff) | |
| parent | d0abbc5bda63dc777c660b703ffcfa4a81a41e1a (diff) | |
Merge branch '1.7.10' of https://github.com/sor1n/Modjam-Mod.git into 1.7.10
Conflicts:
build.gradle
Diffstat (limited to 'src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java')
| -rw-r--r-- | src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java b/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java index 7f547bb..84d1ee4 100644 --- a/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java +++ b/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java @@ -53,8 +53,6 @@ public class EntityHeart extends EntityLiving { super.collideWithEntity(entity);
if (!this.worldObj.isRemote && entity instanceof EntityHeart && getType().equals(((EntityHeart) entity).getType())) {
setQuantity(getQuantity() + ((EntityHeart) entity).getQuantity());
- getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(getQuantity() + ((EntityHeart) entity).getQuantity());
- this.heal(getQuantity());
entity.setDead();
}
}
@@ -76,10 +74,10 @@ public class EntityHeart extends EntityLiving { } else if (getType().equals("White") && playerInfo.getFloat("WhiteHeart") > 0.1F) {
playerInfo.setFloat(getType() + "Heart", 0F);
player.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(player.getMaxHealth() + 2f);
- player.setHealth(player.getHealth() + 2f);
+ player.setHealth(player.getHealth() + 2f);
JewelrycraftMod.netWrapper.sendTo(new PacketSendClientPlayerInfo(playerInfo), (EntityPlayerMP)player);
this.setDead();
- } else if (!getType().equals("Red")) {
+ } else if (!getType().equals("Red") && ((getType().equals("Black") && playerInfo.getFloat("BlackHeart") <= ConfigHandler.MAX_BLACK_HEARTS_PICKUP) || (getType().equals("Blue") && playerInfo.getFloat("BlueHeart") <= ConfigHandler.MAX_BLUE_HEARTS_PICKUP))) {
if(playerInfo.hasKey(getType() + "Heart")) playerInfo.setFloat(getType() + "Heart", playerInfo.getFloat(getType() + "Heart") + getQuantity());
else playerInfo.setFloat(getType() + "Heart", getQuantity());
JewelrycraftMod.netWrapper.sendTo(new PacketSendClientPlayerInfo(playerInfo), (EntityPlayerMP)player);
|