tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Fixed item ejecting

Browse source
This commit is contained in:
Aidan Brady 2013-08-03 17:46:25 -04:00
parent 83a922a87d
commit 77f5ef7930
1 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/resonantinduction/contractor/TileEntityEMContractor.java
View file

@ -40,28 +40,14 @@ public class TileEntityEMContractor extends TileEntity implements IPacketReceive
{ {
pushDelay = Math.max(0, pushDelay-1); pushDelay = Math.max(0, pushDelay-1);
if(suck)
{
System.out.println("SUCK");
}
if(pushDelay != 0)
{
System.out.println("MAH");
}
if(!isLatched())
{
System.out.println("NOOO");
}
if(!suck && pushDelay == 0 && isLatched()) if(!suck && pushDelay == 0 && isLatched())
{ {
System.out.println("Yup");
TileEntity inventoryTile = getLatched(); TileEntity inventoryTile = getLatched();
IInventory inventory = (IInventory)inventoryTile; IInventory inventory = (IInventory)inventoryTile;
if(!(inventoryTile instanceof ISidedInventory)) if(!(inventoryTile instanceof ISidedInventory))
{ {
for(int i = inventory.getSizeInventory()-1; i > 0; i--) for(int i = inventory.getSizeInventory()-1; i >= 0; i--)
{ {
if(inventory.getStackInSlot(i) != null) if(inventory.getStackInSlot(i) != null)
{ {
@ -266,10 +252,10 @@ public class TileEntityEMContractor extends TileEntity implements IPacketReceive
operationBounds = AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord-MAX_REACH, xCoord+1, yCoord+1, zCoord); operationBounds = AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord-MAX_REACH, xCoord+1, yCoord+1, zCoord);
break; break;
case SOUTH: case SOUTH:
operationBounds = AxisAlignedBB.getBoundingBox(xCoord-MAX_REACH, yCoord, zCoord, xCoord, yCoord+1, zCoord+1); operationBounds = AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord+1, yCoord+1, zCoord+MAX_REACH);
break; break;
case WEST: case WEST:
operationBounds = AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord+1, yCoord+1, zCoord+MAX_REACH); operationBounds = AxisAlignedBB.getBoundingBox(xCoord-MAX_REACH, yCoord, zCoord, xCoord, yCoord+1, zCoord+1);
break; break;
case EAST: case EAST:
operationBounds = AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord+MAX_REACH, yCoord+1, zCoord+1); operationBounds = AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord+MAX_REACH, yCoord+1, zCoord+1);
@ -286,7 +272,7 @@ public class TileEntityEMContractor extends TileEntity implements IPacketReceive
{ {
ForgeDirection side = facing.getOpposite(); ForgeDirection side = facing.getOpposite();
TileEntity tile = worldObj.getBlockTileEntity(xCoord+facing.offsetX, yCoord+facing.offsetY, zCoord+facing.offsetZ); TileEntity tile = worldObj.getBlockTileEntity(xCoord+side.offsetX, yCoord+side.offsetY, zCoord+side.offsetZ);
if(tile instanceof IInventory) if(tile instanceof IInventory)
{ {
@ -344,6 +330,7 @@ public class TileEntityEMContractor extends TileEntity implements IPacketReceive
facing = ForgeDirection.getOrientation(input.readInt()); facing = ForgeDirection.getOrientation(input.readInt());
suck = input.readBoolean(); suck = input.readBoolean();
worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord);
updateBounds();
} catch(Exception e) {} } catch(Exception e) {}
} }