summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOnyxDarkKnight <sor1n.iliutza16@gmail.com>2013-12-16 18:15:52 +0200
committerOnyxDarkKnight <sor1n.iliutza16@gmail.com>2013-12-16 18:15:52 +0200
commitf9d492fbb509e9e2b4b3a2fcf1ab04e322940bf2 (patch)
tree6b34593af358bf0e5670f1115e20f3d06bed80ee
parent5ccd234e08724dfb90e5ad416771d87f591bc4fe (diff)
More fixes
-rw-r--r--common/darkknight/jewelrycraft/block/BlockMolder.java6
-rw-r--r--common/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java2
2 files changed, 4 insertions, 4 deletions
diff --git a/common/darkknight/jewelrycraft/block/BlockMolder.java b/common/darkknight/jewelrycraft/block/BlockMolder.java
index 6ccaee5..521698a 100644
--- a/common/darkknight/jewelrycraft/block/BlockMolder.java
+++ b/common/darkknight/jewelrycraft/block/BlockMolder.java
@@ -51,7 +51,7 @@ public class BlockMolder extends BlockContainer
te.hasMold = true;
--item.stackSize;
}
- if (te != null && te.hasMold && entityPlayer.isSneaking())
+ if (te.hasMold && entityPlayer.isSneaking())
{
entityPlayer.inventory.addItemStackToInventory(new ItemStack(te.mold.itemID, 1, te.mold.getItemDamage()));
te.mold = new ItemStack(0, 0, 0);
@@ -62,8 +62,7 @@ public class BlockMolder extends BlockContainer
@Override
public void onBlockDestroyedByPlayer(World world, int i, int j, int k, int par5)
- {
-
+ {
TileEntityMolder te = (TileEntityMolder) world.getBlockTileEntity(i, j, k);
if (te != null)
{
@@ -119,6 +118,7 @@ public class BlockMolder extends BlockContainer
Item r = new ItemRing(ItemList.ring.itemID, metal).setUnlocalizedName("jewelrycraft.ring");
copy = new ItemStack(r);
}
+ else copy = item;
player.inventory.addItemStackToInventory(copy);
}
}
diff --git a/common/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java b/common/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java
index d25534f..85503c9 100644
--- a/common/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java
+++ b/common/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java
@@ -71,7 +71,7 @@ public class TileEntitySmelter extends TileEntity
for (int l = 0; l < 5; ++l)
{
//EntityFX entityfx = new EntityReddustFX(this.worldObj, (double)xCoord + Math.random(), (double)yCoord + 0.2D, (double)zCoord + Math.random(), 0.0F, 0.0F, 0.0F);
- this.worldObj.spawnParticle("flame", (double)xCoord + Math.random(), (double)yCoord + 0.5F, (double)zCoord + Math.random(), 0.0D, 0.0D, 0.0D);
+ this.worldObj.spawnParticle("flame", (double)xCoord, (double)yCoord + 1.5F, (double)zCoord, 0.0D, 0.0D, 0.0D);
}
}
if(rand.nextInt(65) == 0){