From 1abd7b56139c871f0d7590f557d24927ba34dd79 Mon Sep 17 00:00:00 2001 From: The Dark Knight Date: Sat, 22 Aug 2015 01:00:58 +0200 Subject: Updated hearts - They should no longer increase health when combining - They can now be limited to how much each heart can be picked --- src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/main/java/darkknight') 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); -- cgit v1.2.3