From 05e82be19ee915a42ada1d69e12c4de55590562f Mon Sep 17 00:00:00 2001 From: OnyxDarkKnight Date: Thu, 2 Jul 2015 00:04:40 +0100 Subject: Fixed a major issue with Curses and possibly Hearts --- src/main/java/darkknight/jewelrycraft/api/Curse.java | 3 +-- src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java | 2 +- src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java | 5 +++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/darkknight/jewelrycraft/api/Curse.java b/src/main/java/darkknight/jewelrycraft/api/Curse.java index beff14b..c8c4d60 100644 --- a/src/main/java/darkknight/jewelrycraft/api/Curse.java +++ b/src/main/java/darkknight/jewelrycraft/api/Curse.java @@ -2,8 +2,8 @@ package darkknight.jewelrycraft.api; import java.util.ArrayList; import java.util.Random; + import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiIngame; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -20,7 +20,6 @@ public abstract class Curse protected int textureID; protected String name, description, texturePackName; protected Random rand = new Random(); - protected Minecraft mc = Minecraft.getMinecraft(); private static ArrayList curses = new ArrayList(); public static ArrayList availableCurses = new ArrayList(); diff --git a/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java b/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java index 60608fb..faefe84 100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java @@ -84,7 +84,7 @@ public class CursePentagram extends Curse { @SideOnly(Side.CLIENT) public void playerHandRender(EntityPlayer player, RenderHandEvent event) { - if (mc.gameSettings.thirdPersonView == 0) { + if (Minecraft.getMinecraft().gameSettings.thirdPersonView == 0) { ResourceLocation PENTAGRAM_TEXTURE = new ResourceLocation(Variables.MODID, "textures/gui/" + getTexturePack() + ".png"); GL11.glPushMatrix(); GL11.glEnable(GL11.GL_BLEND); 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(); } -- cgit v1.2.3