diff options
Diffstat (limited to 'src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java')
| -rwxr-xr-x | src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java | 83 |
1 files changed, 53 insertions, 30 deletions
diff --git a/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java b/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java index cbfc21a..2590e55 100755 --- a/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java +++ b/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java @@ -57,10 +57,12 @@ public class EntityHeart extends EntityLiving { @Override
protected void collideWithEntity(Entity entity) {
super.collideWithEntity(entity);
- if (!this.worldObj.isRemote && entity instanceof EntityHeart
- && getType().equals(((EntityHeart) entity).getType())) {
- setQuantity(
- getQuantity() + ((EntityHeart) entity).getQuantity());
+ if (!this.worldObj.isRemote
+ && entity instanceof EntityHeart
+ && getType().equals(((EntityHeart) entity)
+ .getType())) {
+ setQuantity(getQuantity() + ((EntityHeart) entity)
+ .getQuantity());
entity.setDead();
}
}
@@ -69,49 +71,68 @@ public class EntityHeart extends EntityLiving { public void onCollideWithPlayer(EntityPlayer player) {
if (!this.worldObj.isRemote) {
NBTTagCompound playerInfo = PlayerUtils
- .getModPlayerPersistTag(player, Variables.MODID);
+ .getModPlayerPersistTag(player,
+ Variables.MODID);
if (playerInfo != null) {
- if (getType().equals("Red")
- && player.getHealth() < player.getMaxHealth()) {
- float healAmount =
- player.getMaxHealth() - player.getHealth();
+ if (getType().equals("Red") && player
+ .getHealth() < player
+ .getMaxHealth()) {
+ float healAmount = player
+ .getMaxHealth()
+ - player.getHealth();
if (getQuantity() > healAmount) {
player.heal(healAmount);
- this.setQuantity(getQuantity() - healAmount);
+ this.setQuantity(
+ getQuantity() - healAmount);
} else {
player.heal(getQuantity());
this.setDead();
}
} else if (getType().equals("White")
- && playerInfo.getFloat("WhiteHeart") > 0.1F) {
- playerInfo.setFloat(getType() + "Heart", 0F);
+ && playerInfo.getFloat(
+ "WhiteHeart") > 0.1F) {
+ playerInfo.setFloat(getType()
+ + "Heart", 0F);
if (player.getMaxHealth() < 40F) {
player.getEntityAttribute(
SharedMonsterAttributes.maxHealth)
- .setBaseValue(player.getMaxHealth() + 2f);
- player.setHealth(player.getHealth() + 2f);
+ .setBaseValue(player
+ .getMaxHealth()
+ + 2f);
+ player.setHealth(player
+ .getHealth()
+ + 2f);
}
JewelrycraftMod.netWrapper.sendTo(
- new PacketSendClientPlayerInfo(playerInfo),
+ new PacketSendClientPlayerInfo(
+ playerInfo),
(EntityPlayerMP) player);
this.setDead();
} else if (!getType().equals("Red")
- && ((getType().equals("Black")
+ && ((getType().equals(
+ "Black")
&& playerInfo.getFloat(
"BlackHeart") <= ConfigHandler.MAX_BLACK_HEARTS_PICKUP)
- || (getType().equals("Blue")
+ || (getType().equals(
+ "Blue")
&& playerInfo.getFloat(
"BlueHeart") <= ConfigHandler.MAX_BLUE_HEARTS_PICKUP)
- || getType().equals("White"))) {
- if (playerInfo.hasKey(getType() + "Heart"))
- playerInfo.setFloat(getType() + "Heart",
- playerInfo.getFloat(getType() + "Heart")
+ || getType().equals(
+ "White"))) {
+ if (playerInfo.hasKey(getType()
+ + "Heart"))
+ playerInfo.setFloat(
+ getType() + "Heart",
+ playerInfo.getFloat(
+ getType() + "Heart")
+ getQuantity());
else
- playerInfo.setFloat(getType() + "Heart",
+ playerInfo.setFloat(
+ getType() + "Heart",
getQuantity());
JewelrycraftMod.netWrapper.sendTo(
- new PacketSendClientPlayerInfo(playerInfo),
+ new PacketSendClientPlayerInfo(
+ playerInfo),
(EntityPlayerMP) player);
this.setDead();
}
@@ -122,12 +143,14 @@ public class EntityHeart extends EntityLiving { @Override
public void onDeath(DamageSource source) {
super.onDeath(source);
- if (source.getEntity() != null
- && source.getEntity() instanceof EntityPlayer)
+ if (source.getEntity() != null && source
+ .getEntity() instanceof EntityPlayer)
((EntityPlayer) source.getEntity()).addChatMessage(
- new ChatComponentText(StatCollector.translateToLocal(
- "chatmessage." + Variables.MODID
- + ".heartKilled." + this.getType())));
+ new ChatComponentText(StatCollector
+ .translateToLocal(
+ "chatmessage." + Variables.MODID
+ + ".heartKilled."
+ + this.getType())));
}
@Override
@@ -151,8 +174,8 @@ public class EntityHeart extends EntityLiving { }
/**
- * (abstract) Protected helper method to read subclass entity data from
- * NBT.
+ * (abstract) Protected helper method to read subclass entity data
+ * from NBT.
*/
@Override
public void readEntityFromNBT(NBTTagCompound nbt) {
|