summaryrefslogtreecommitdiff
path: root/src/main/java/darkknight/jewelrycraft/entities/EntityHalfHeart.java
diff options
context:
space:
mode:
authorOnyxDarkKnight <sor1n.iliutza16@gmail.com>2015-04-12 16:29:24 +0300
committerOnyxDarkKnight <sor1n.iliutza16@gmail.com>2015-04-12 16:29:24 +0300
commit4f29b0ed24e393be7074abd851e207aadab38196 (patch)
treebe8e5211a2956589c08b5e88b5e083e6aaeb96ce /src/main/java/darkknight/jewelrycraft/entities/EntityHalfHeart.java
parent6312636fd9a4d0f56dc7c9ff474a99d879bcb4e9 (diff)
I rearranged files and added a few cool stuff.
Diffstat (limited to 'src/main/java/darkknight/jewelrycraft/entities/EntityHalfHeart.java')
-rw-r--r--src/main/java/darkknight/jewelrycraft/entities/EntityHalfHeart.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/darkknight/jewelrycraft/entities/EntityHalfHeart.java b/src/main/java/darkknight/jewelrycraft/entities/EntityHalfHeart.java
index 4fc1e39..4fad309 100644
--- a/src/main/java/darkknight/jewelrycraft/entities/EntityHalfHeart.java
+++ b/src/main/java/darkknight/jewelrycraft/entities/EntityHalfHeart.java
@@ -12,6 +12,7 @@ import net.minecraft.world.World;
import darkknight.jewelrycraft.JewelrycraftMod;
import darkknight.jewelrycraft.network.PacketRequestPlayerInfo;
import darkknight.jewelrycraft.util.PlayerUtils;
+import darkknight.jewelrycraft.util.Variables;
/**
* @author Sorin
@@ -27,7 +28,7 @@ public class EntityHalfHeart extends EntityHeart
public void onCollideWithPlayer(EntityPlayer player)
{
if (!player.worldObj.isRemote){
- NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, "Jewelrycraft");
+ NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);
if (getType().equals("Red") && player.getHealth() < player.getMaxHealth()){
player.heal(1f);
this.setDead();
@@ -35,8 +36,8 @@ public class EntityHalfHeart extends EntityHeart
playerInfo.setFloat(getType() + "Heart", 0F);
player.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(player.getMaxHealth() + 2f);
this.setDead();
- }else if (!getType().equals("Red") && playerInfo.getFloat(getType() + "Heart") < 20f){
- playerInfo.setFloat(getType() + "Heart", playerInfo.getFloat(getType() + "Heart") + 1.0F <= 20f ? playerInfo.getFloat(getType() + "Heart") + 1.0F : 20f);
+ }else if (!getType().equals("Red")){
+ playerInfo.setFloat(getType() + "Heart", playerInfo.getFloat(getType() + "Heart") + 1.0F);
this.setDead();
}
}