From d93d4b2fce115a6f792386f73124cdafce09020f Mon Sep 17 00:00:00 2001 From: Robert S Date: Tue, 27 May 2014 03:11:34 -0400 Subject: [PATCH] Fixed some minor issues with creative mode interaction with crates --- .../archaic/crate/BlockCrate.java | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/archaic/src/main/scala/resonantinduction/archaic/crate/BlockCrate.java b/archaic/src/main/scala/resonantinduction/archaic/crate/BlockCrate.java index 4d0150eb1..3a42c43f1 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/crate/BlockCrate.java +++ b/archaic/src/main/scala/resonantinduction/archaic/crate/BlockCrate.java @@ -68,8 +68,8 @@ public class BlockCrate extends BlockTile if (!world.isRemote && world.getBlockTileEntity(x, y, z) instanceof TileCrate) { TileCrate tileEntity = (TileCrate) world.getBlockTileEntity(x, y, z); - this.tryEject(tileEntity, player, world.getWorldTime() - tileEntity.prevClickTime < 10); - tileEntity.prevClickTime = world.getWorldTime(); + this.tryEject(tileEntity, player, (System.currentTimeMillis() - tileEntity.prevClickTime) < 10); + tileEntity.prevClickTime = System.currentTimeMillis(); } } @@ -139,28 +139,31 @@ public class BlockCrate extends BlockTile ItemStack current = player.inventory.getCurrentItem(); if (player.capabilities.isCreativeMode) { - if (side == 1 && current != null && tile.getSampleStack() == null) + if (side == 1) { - ItemStack cStack = current.copy(); - cStack.stackSize = TileCrate.getSlotCount(world.getBlockMetadata(x, y, z)) * 64; - addStackToCrate(tile, cStack); + if (current != null && tile.getSampleStack() == null) + { + ItemStack cStack = current.copy(); + cStack.stackSize = TileCrate.getSlotCount(world.getBlockMetadata(x, y, z)) * 64; + addStackToCrate(tile, cStack); + } } - else if (hitY >= 0.5) + else if (hitY <= 0.5) { - tryEject(tile, player, world.getWorldTime() - tile.prevClickTime < 10); + tryEject(tile, player, System.currentTimeMillis() - tile.prevClickTime < 10); } else { - tryInsert(tile, player, world.getWorldTime() - tile.prevClickTime < 10); + tryInsert(tile, player, System.currentTimeMillis() - tile.prevClickTime < 10); } } else { - tryInsert(tile, player, world.getWorldTime() - tile.prevClickTime < 10); + tryInsert(tile, player, System.currentTimeMillis() - tile.prevClickTime < 10); } } - tile.prevClickTime = world.getWorldTime(); + tile.prevClickTime = System.currentTimeMillis(); } return true; }